diff --git a/yast2-installation-3.1.215.tar.bz2 b/yast2-installation-3.1.215.tar.bz2
index 0c496bb..3df868a 100644
--- a/yast2-installation-3.1.215.tar.bz2
+++ b/yast2-installation-3.1.215.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cc4a7564a6d7016773b08de805353a17e5516613c33047691e99089499db2ddf
-size 437993
+oid sha256:f19f92c725b09c8612e098a08eea410337c8c28c598fa2ea849521b29b55080c
+size 429145
diff --git a/yast2-installation.changes b/yast2-installation.changes
index 7e87401..76d74f0 100644
--- a/yast2-installation.changes
+++ b/yast2-installation.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Sep 14 13:53:41 UTC 2016 - jreidinger@suse.com
+
+- reduce time needed for building this package
+
 -------------------------------------------------------------------
 Tue Sep 13 12:37:57 UTC 2016 - jreidinger@suse.com
 
diff --git a/yast2-installation.spec b/yast2-installation.spec
index 20a03dc..5a662f0 100644
--- a/yast2-installation.spec
+++ b/yast2-installation.spec
@@ -33,20 +33,16 @@ Group:          System/YaST
 Source1:        YaST2-Second-Stage.service
 Source2:        YaST2-Firstboot.service
 
-BuildRequires:  docbook-xsl-stylesheets
-BuildRequires:  libxslt
 BuildRequires:  update-desktop-files
-BuildRequires:  yast2-core-devel
 BuildRequires:  yast2-devtools >= 3.1.10
-BuildRequires:  yast2-packager >= 3.1.113
+# needed for xml agent reading about products
+BuildRequires:  yast2-xml
 BuildRequires:  rubygem(rspec)
+BuildRequires:  rubygem(yast-rake)
 
 # Moved proc_modules.scr
 BuildRequires:  yast2 >= 3.1.180
 
-# Yast::Remote
-BuildRequires:  yast2-network
-
 # AutoinstSoftware.SavePackageSelection()
 Requires:       autoyast2-installation >= 3.1.105
 
@@ -112,7 +108,6 @@ Requires:       gzip
 Requires:       tar
 
 %if 0%{?suse_version} >= 1210
-BuildRequires:  systemd-devel
 %{systemd_requires}
 %endif
 
@@ -145,17 +140,27 @@ System installation code as present on installation media.
 %prep
 %setup -n %{name}-%{version}
 
+%check
+rake test:unit
+
 %build
-%yast_build
 
 %install
-%yast_install
+rake install DESTDIR="%{buildroot}"
 
 for f in `find %{buildroot}%{_datadir}/autoinstall/modules -name "*.desktop"`; do
     %suse_update_desktop_file $f
-done 
+done
 
 mkdir -p %{buildroot}%{yast_vardir}/hooks/installation
+mkdir -p %{buildroot}%{yast_ystartupdir}/startup/hooks/preFirstCall
+mkdir -p %{buildroot}%{yast_ystartupdir}/startup/hooks/preSecondCall
+mkdir -p %{buildroot}%{yast_ystartupdir}/startup/hooks/postFirstCall
+mkdir -p %{buildroot}%{yast_ystartupdir}/startup/hooks/postSecondCall
+mkdir -p %{buildroot}%{yast_ystartupdir}/startup/hooks/preFirstStage
+mkdir -p %{buildroot}%{yast_ystartupdir}/startup/hooks/preSecondStage
+mkdir -p %{buildroot}%{yast_ystartupdir}/startup/hooks/postFirstStage
+mkdir -p %{buildroot}%{yast_ystartupdir}/startup/hooks/postSecondStage
 
 mkdir -p %{buildroot}%{_unitdir}
 install -m 644 %{SOURCE1} %{buildroot}%{_unitdir}
@@ -228,6 +233,8 @@ systemctl enable YaST2-Firstboot.service
 %dir %{yast_vardir}/hooks/installation
 
 %dir %{yast_docdir}
-%{yast_docdir}/COPYING
+%doc %{yast_docdir}/COPYING
+%doc %{yast_docdir}/README.md
+%doc %{yast_docdir}/CONTRIBUTING.md
 
 %changelog