diff --git a/snapd.spec b/snapd.spec
index c2a11a6..ab0d500 100644
--- a/snapd.spec
+++ b/snapd.spec
@@ -310,29 +310,6 @@ providing packages with %{import_path} prefix.
 
 
 %build
-# Build SELinux module
-pushd ./data/selinux
-make SHARE="%{_datadir}" TARGETS="snappy"
-popd
-
-# Generate version files
-./mkversion.sh "%{version}-%{release}"
-
-# Build snap-confine
-pushd ./cmd
-autoreconf --force --install --verbose
-# selinux support is not yet available, for now just disable apparmor
-# FIXME: add --enable-caps-over-setuid as soon as possible (setuid discouraged!)
-# XXX: Seccomp disabled until LP#1674193 is fixed
-%configure \
-    --disable-apparmor --disable-seccomp \
-    --libexecdir=%{_libexecdir}/snapd/ \
-    --with-snap-mount-dir=%{_sharedstatedir}/snapd/snap \
-    --with-merged-usr
-
-%make_build
-popd
-
 # Build snapd
 mkdir -p src/github.com/snapcore
 ln -s ../../../ src/github.com/snapcore/snapd
@@ -356,6 +333,29 @@ go build -o bin/snapctl %{import_path}/cmd/snapctl
 go build -o bin/snapd %{import_path}/cmd/snapd
 %endif
 
+# Build SELinux module
+pushd ./data/selinux
+make SHARE="%{_datadir}" TARGETS="snappy"
+popd
+
+# Generate version files
+./mkversion.sh "%{version}-%{release}"
+
+# Build snap-confine
+pushd ./cmd
+autoreconf --force --install --verbose
+# selinux support is not yet available, for now just disable apparmor
+# FIXME: add --enable-caps-over-setuid as soon as possible (setuid discouraged!)
+# XXX: Seccomp disabled until LP#1674193 is fixed
+%configure \
+    --disable-apparmor --disable-seccomp \
+    --libexecdir=%{_libexecdir}/snapd/ \
+    --with-snap-mount-dir=%{_sharedstatedir}/snapd/snap \
+    --with-merged-usr
+
+%make_build
+popd
+
 %install
 install -d -p %{buildroot}%{_bindir}
 install -d -p %{buildroot}%{_libexecdir}/snapd
@@ -396,10 +396,10 @@ rm -rfv %{buildroot}%{_sysconfdir}/apparmor.d
 popd
 
 # Install all systemd units
-install -p -m 0644 packaging/fedora/systemd/snapd.socket %{buildroot}%{_unitdir}
-install -p -m 0644 packaging/fedora/systemd/snapd.service %{buildroot}%{_unitdir}
-install -p -m 0644 packaging/fedora/systemd/snapd.refresh.service %{buildroot}%{_unitdir}
-install -p -m 0644 packaging/fedora/systemd/snapd.refresh.timer %{buildroot}%{_unitdir}
+install -p -m 0644 data/systemd/snapd.socket %{buildroot}%{_unitdir}
+install -p -m 0644 data/systemd/snapd.service %{buildroot}%{_unitdir}
+install -p -m 0644 data/systemd/snapd.refresh.service %{buildroot}%{_unitdir}
+install -p -m 0644 data/systemd/snapd.refresh.timer %{buildroot}%{_unitdir}
 
 # Put /var/lib/snapd/snap/bin on PATH
 # Put /var/lib/snapd/desktop on XDG_DATA_DIRS