diff --git a/.gitignore b/.gitignore
index e2f521b..039e9f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,2 @@
-/org.eclipse.tm.terminal-4ea71eb57ec10177e6d0caf3429196e4882562b9.tar.xz
-/org.eclipse.tm.terminal-e58c5d3506ba4a17e160a7fa19463f2e9c3491f2.tar.xz
-/org.eclipse.tm.terminal-4.0.0.tar.xz
-/org.eclipse.tm.terminal-cf7ef3f052a0bb3276966f2a0d6110afc4e793bc.tar.xz
-/org.eclipse.tm.terminal-4.1_neon.tar.xz
-/org.eclipse.tm.terminal-4.2_neon.2.tar.xz
+/org.eclipse.tm.terminal-*.tar.xz
+/*.src.rpm
diff --git a/eclipse-tm-terminal.spec b/eclipse-tm-terminal.spec
index 5600bfa..d63799b 100644
--- a/eclipse-tm-terminal.spec
+++ b/eclipse-tm-terminal.spec
@@ -6,7 +6,7 @@
 
 Name:           eclipse-tm-terminal
 Version:        4.2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Terminal plug-in for Eclipse
 
 License:        EPL
@@ -23,6 +23,7 @@ BuildRequires: 	eclipse-egit
 BuildRequires:  eclipse-cdt
 BuildRequires:  eclipse-rse
 BuildRequires:  eclipse-remote
+BuildRequires:  rxtx >= 2.2-0.15
 %endif
 
 %description
@@ -64,23 +65,23 @@ Sources and developer resources for the Terminal plug-in for Eclipse.
 %pom_disable_module plugins/org.eclipse.tm.terminal.connector.remote
 %pom_disable_module features/org.eclipse.tm.terminal.connector.remote.feature
 %pom_disable_module features/org.eclipse.tm.terminal.connector.remote.sdk.feature
+%pom_disable_module plugins/org.eclipse.tm.terminal.connector.serial
+%pom_disable_module features/org.eclipse.tm.terminal.connector.serial.feature
+%pom_disable_module features/org.eclipse.tm.terminal.connector.serial.sdk.feature
 %pom_disable_module plugins/org.eclipse.tm.terminal.view.ui.rse
 %pom_disable_module features/org.eclipse.tm.terminal.view.rse.feature
 %pom_disable_module features/org.eclipse.tm.terminal.view.rse.sdk.feature
-%pom_xpath_remove "import[@feature='org.eclipse.tm.terminal.connector.local.feature']" \
-  features/org.eclipse.tm.terminal.feature/feature.xml
 %pom_xpath_remove "import[@feature='org.eclipse.tm.terminal.connector.local.sdk.feature']" \
   features/org.eclipse.tm.terminal.sdk.feature/feature.xml
+%pom_xpath_remove "import[@feature='org.eclipse.tm.terminal.connector.serial.sdk.feature']" \
+  features/org.eclipse.tm.terminal.sdk.feature/feature.xml
 %endif
 
-#drop due to gnu.io dep not available
-%pom_disable_module plugins/org.eclipse.tm.terminal.connector.serial
-%pom_disable_module features/org.eclipse.tm.terminal.connector.serial.feature
-%pom_disable_module features/org.eclipse.tm.terminal.connector.serial.sdk.feature
+# Remove cycles between subpackages
+%pom_xpath_remove "import[@feature='org.eclipse.tm.terminal.connector.local.feature']" \
+  features/org.eclipse.tm.terminal.feature/feature.xml
 %pom_xpath_remove "import[@feature='org.eclipse.tm.terminal.connector.serial.feature']" \
   features/org.eclipse.tm.terminal.feature/feature.xml
-%pom_xpath_remove "import[@feature='org.eclipse.tm.terminal.connector.serial.sdk.feature']" \
-  features/org.eclipse.tm.terminal.sdk.feature/feature.xml
 
 %pom_xpath_remove "pom:plugin[pom:artifactId[text()='tycho-packaging-plugin']]/pom:configuration" admin/pom-config.xml
 
@@ -91,7 +92,7 @@ sed -i -e "s|p2.inf||g" features/org.eclipse.tm.terminal.view.feature/build.prop
 %mvn_package "::pom::" __noinstall
 %mvn_package "::jar:sources:" sdk
 %mvn_package ":*.sdk.feature" sdk
-%mvn_package ":org.eclipse.tm.terminal.connector.{local,process,remote}*" connectors
+%mvn_package ":org.eclipse.tm.terminal.connector.{local,process,remote,serial}*" connectors
 %mvn_package ":org.eclipse.tm.terminal.view.{rse,ui.rse}*" connectors
 %mvn_package ":"
 
@@ -110,6 +111,9 @@ sed -i -e "s|p2.inf||g" features/org.eclipse.tm.terminal.view.feature/build.prop
 %files sdk -f .mfiles-sdk
 
 %changelog
+* Fri Mar 31 2017 Mat Booth <mat.booth@redhat.com> - 4.2.0-2
+- Build serial port bundles, resolves rhbz#1272785
+
 * Wed Mar 29 2017 Mat Booth <mat.booth@redhat.com> - 4.2.0-1
 - Update to latest upstream release