diff --git a/usb_modeswitch.changes b/usb_modeswitch.changes
index d89b18b..b69591f 100644
--- a/usb_modeswitch.changes
+++ b/usb_modeswitch.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Sep 13 16:04:56 UTC 2016 - stefan.bruens@rwth-aachen.de
+
+- Avoid a race in make install, which lead to packaging a truncated
+  usb_modeswitch_dispatcher script. Fixes boo#998641
+
 -------------------------------------------------------------------
 Sat Aug 20 17:25:12 UTC 2016 - stefan.bruens@rwth-aachen.de
 
diff --git a/usb_modeswitch.spec b/usb_modeswitch.spec
index 3091a02..ba693ec 100644
--- a/usb_modeswitch.spec
+++ b/usb_modeswitch.spec
@@ -65,8 +65,11 @@ cp %{SOURCE2} .
 CFLAGS="%{optflags}" make
 
 %install
-make DESTDIR=%{buildroot} install %{?_smp_mflags} UDEVDIR=%{buildroot}%{_udevdir}
+# The install target recreates usb_modeswitch_dispatcher, which is racy in respect to its
+# installation. install-common just uses the file from the build phase. boo#998641
+make DESTDIR=%{buildroot} install-common %{?_smp_mflags} UDEVDIR=%{buildroot}%{_udevdir}
 install --mode=444 -D -t %{buildroot}%{_unitdir} usb_modeswitch@.service
+
 cd %{source_name}-data-%{date}
 make DESTDIR=%{buildroot} install %{?_smp_mflags} RULESDIR=%{buildroot}%{_udevdir}/rules.d