diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index cf1bed9..9c3106b 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -27,7 +27,7 @@ Epoch: 1
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           %{?scl_prefix}eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        0.3.git6c36f7f%{?dist}
+Release:        0.4.git6c36f7f%{?dist}
 License:        EPL and CPL
 URL:            http://www.eclipse.org/cdt
 Requires:       eclipse-platform
@@ -59,7 +59,7 @@ Patch4: %{pkg_name}-cdtdebug-readme.patch
 # Following fixes jetty reqs in CDT target
 Patch5: %{pkg_name}-target.patch
 
-Patch6: remove-arduino-docker.patch
+Patch6: remove-docker.patch
 
 BuildRequires: tycho
 BuildRequires: tycho-extras
@@ -74,6 +74,7 @@ BuildRequires: %{?scl_prefix}lpg-java-compat
 BuildRequires: %{?scl_prefix}eclipse-platform >= 1:4.3.0
 BuildRequires: %{?scl_prefix}eclipse-tests >= 1:4.3.0
 BuildRequires: %{?scl_prefix}eclipse-swtbot
+BuildRequires: eclipse-launchbar
 BuildRequires: nekohtml >= 1.9.21-3
 BuildRequires: exec-maven-plugin
 BuildRequires: jacoco-maven-plugin
@@ -105,6 +106,15 @@ Requires:       clang
 %description llvm
 Optional llvm parsers for the CDT.
 
+%package arduino
+Summary:        Arduino C++ Tools
+Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       lpg-java-compat
+Requires:       clang
+
+%description arduino
+Extensions to support Arduino C++ projects in Eclipse.
+
 %package tests
 Summary:	Eclipse C/C++ Development Tools (CDT) Tests
 Requires:       %{name} = %{epoch}:%{version}-%{release}
@@ -181,10 +191,6 @@ popd
 %pom_disable_module launch/org.eclipse.cdt.docker.launcher-feature
 %pom_disable_module launch/org.eclipse.cdt.docker.launcher.source-feature
 
-%pom_disable_module toolchains/arduino/org.eclipse.cdt.arduino.core
-%pom_disable_module toolchains/arduino/org.eclipse.cdt.arduino.ui
-%pom_disable_module toolchains/arduino/org.eclipse.cdt.arduino-feature
-
 sed -i -e "s|org.junit|org.hamcrest.core, org.junit|g" dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/META-INF/MANIFEST.MF
 
 popd
@@ -213,12 +219,14 @@ popd
 installDir=${RPM_BUILD_ROOT}/%{eclipse_base}/dropins/cdt
 testInstallDir=${RPM_BUILD_ROOT}/%{_javadir}/eclipse-cdt-tests/plugins
 parsersInstallDir=${installDir}-parsers
+arduinoInstallDir=${installDir}-arduino
 llvmInstallDir=${installDir}-llvm
 sdkInstallDir=${installDir}-sdk
 binInstallDir=${RPM_BUILD_ROOT}/%{_bindir}
 manInstallDir=${RPM_BUILD_ROOT}/%{_mandir}/man1
 install -d -m755 $installDir
 install -d -m755 $parsersInstallDir
+install -d -m755 $arduinoInstallDir
 install -d -m755 $llvmInstallDir
 install -d -m755 $sdkInstallDir
 install -d -m755 $testInstallDir
@@ -346,6 +354,11 @@ mkdir -p $llvmInstallDir/eclipse/features $llvmInstallDir/eclipse/plugins
 mv $installDir/eclipse/features/*llvm* $llvmInstallDir/eclipse/features
 mv $installDir/eclipse/plugins/*llvm* $llvmInstallDir/eclipse/plugins
 
+# Move arudion plugins/features to arduino install area.
+mkdir -p $arduinoInstallDir/eclipse/features $arduinoInstallDir/eclipse/plugins
+mv $installDir/eclipse/features/*arduino* $arduinoInstallDir/eclipse/features
+mv $installDir/eclipse/plugins/*arduino* $arduinoInstallDir/eclipse/plugins
+
 mkdir -p $sdkInstallDir/eclipse/features $sdkInstallDir/eclipse/plugins
 mv $installDir/eclipse/features/*source* $sdkInstallDir/eclipse/features
 mv $installDir/eclipse/plugins/*source* $sdkInstallDir/eclipse/plugins
@@ -390,7 +403,15 @@ rm -rf $installDir/eclipse/binary
 %doc %{cdt_snapshot}/releng/org.eclipse.cdt.releng/epl-v10.html
 %doc %{cdt_snapshot}/releng/org.eclipse.cdt.releng/notice.html
 
+%files arduino
+%{eclipse_base}/dropins/cdt-arduino
+%doc %{cdt_snapshot}/releng/org.eclipse.cdt.releng/epl-v10.html
+%doc %{cdt_snapshot}/releng/org.eclipse.cdt.releng/notice.html
+
 %changelog
+* Thu Jun 4 2015 Alexander Kurtakov <akurtako@redhat.com> 1:8.7.0-0.4.git6c36f7f
+- Add arduino subpackage and enable building arduino plugins.
+
 * Wed Jun 3 2015 Alexander Kurtakov <akurtako@redhat.com> 1:8.7.0-0.3.git6c36f7f
 - Drop Linux Tools libhover compilation and Recommend eclipse-linuxtools-libhover instead. 
 
diff --git a/remove-arduino-docker.patch b/remove-arduino-docker.patch
deleted file mode 100644
index bcd01ca..0000000
--- a/remove-arduino-docker.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- releng/org.eclipse.cdt.repo/category.xml.old	2015-06-01 18:04:29.862463846 +0300
-+++ releng/org.eclipse.cdt.repo/category.xml	2015-06-01 21:55:29.106309997 +0300
-@@ -65,12 +65,6 @@
-    <feature url="features/org.eclipse.cdt.autotools.source_0.0.0.qualifier.jar" id="org.eclipse.cdt.autotools.source" version="0.0.0">
-       <category name="extra"/>
-    </feature>
--   <feature url="features/org.eclipse.cdt.docker.launcher_0.0.0.qualifier.jar" id="org.eclipse.cdt.docker.launcher" version="0.0.0">
--      <category name="extra"/>
--   </feature>
--   <feature url="features/org.eclipse.cdt.docker.launcher.source_0.0.0.qualifier.jar" id="org.eclipse.cdt.docker.launcher.source" version="0.0.0">
--      <category name="extra"/>
--   </feature>
-    <feature url="features/org.eclipse.cdt.testsrunner.feature_0.0.0.qualifier.jar" id="org.eclipse.cdt.testsrunner.feature" version="0.0.0">
-       <category name="extra"/>
-    </feature>
-@@ -92,6 +86,4 @@
-    <feature url="features/org.eclipse.cdt.debug.standalone.source_0.0.0.qualifier.jar" id="org.eclipse.cdt.debug.standalone.source" version="0.0.0">
-       <category name="extra"/>
-    </feature>
--   <feature id="org.eclipse.cdt.arduino">
--   </feature>
--</site>
-+ </site>
diff --git a/remove-docker.patch b/remove-docker.patch
new file mode 100644
index 0000000..2cd0938
--- /dev/null
+++ b/remove-docker.patch
@@ -0,0 +1,15 @@
+--- releng/org.eclipse.cdt.repo/category.xml.sav	2015-06-02 07:25:40.000000000 +0300
++++ releng/org.eclipse.cdt.repo/category.xml	2015-06-04 08:44:10.092273085 +0300
+@@ -65,12 +65,6 @@
+    <feature url="features/org.eclipse.cdt.autotools.source_0.0.0.qualifier.jar" id="org.eclipse.cdt.autotools.source" version="0.0.0">
+       <category name="extra"/>
+    </feature>
+-   <feature url="features/org.eclipse.cdt.docker.launcher_0.0.0.qualifier.jar" id="org.eclipse.cdt.docker.launcher" version="0.0.0">
+-      <category name="extra"/>
+-   </feature>
+-   <feature url="features/org.eclipse.cdt.docker.launcher.source_0.0.0.qualifier.jar" id="org.eclipse.cdt.docker.launcher.source" version="0.0.0">
+-      <category name="extra"/>
+-   </feature>
+    <feature url="features/org.eclipse.cdt.testsrunner.feature_0.0.0.qualifier.jar" id="org.eclipse.cdt.testsrunner.feature" version="0.0.0">
+       <category name="extra"/>
+    </feature>