diff --git a/.gitignore b/.gitignore
index 4266f0a..f2d4c1e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /usbip-3.18.tar.xz
+/usbip-3.17.tar.xz
diff --git a/usbip-client.service b/usbip-client.service
index 2562e7b..b10b74b 100644
--- a/usbip-client.service
+++ b/usbip-client.service
@@ -2,7 +2,7 @@
 Description=USB/IP client modules
 
 [Service]
-Type=OneShot
+Type=oneshot
 RemainAfterExit=true
 ExecStart=/sbin/modprobe -qab vhci-hcd
 
diff --git a/usbip.spec b/usbip.spec
index bfe274c..ea04354 100644
--- a/usbip.spec
+++ b/usbip.spec
@@ -5,7 +5,7 @@ License:	GPLv2+
 Summary:	USB/IP user-space
 Group:		System Environment/Daemons
 Version:	3.18
-Release:	3%{?dist}
+Release:	1%{?dist}
 #Source:	https://www.kernel.org/pub/linux/kernel/v3.x/linux-%%{version}.tar.xz
 # In the interests of keeping the source rpm from being ridiculously large,
 # download the Linux kernel from above and run `extract_usbip.sh <version>`
@@ -51,7 +51,7 @@ development
 
 %build
 ./autogen.sh
-%configure --disable-static --with-usbids-dir=%{_datadir}hwdata
+%configure --disable-static --with-usbids-dir=%{_datadir}/hwdata
 make %{?_smp_mflags}
 
 %install
@@ -86,10 +86,15 @@ install -pm 644 %{SOURCE2} %{buildroot}%{_unitdir}
 %{_libdir}/*.so
 
 %changelog
-* Thu Jan 15 2015 - Jonathan Dieter <jdieter@lesbg.com> - 3.18-3
+* Thu Feb  5 2015 - Jonathan Dieter <jdieter@lesbg.com> - 3.18-1
+- Fix datadir (#1189855)
+- Fix client service type
+- Update to 3.18
+
+* Thu Jan 15 2015 - Jonathan Dieter <jdieter@lesbg.com> - 3.17-3
 - Improve description
 
-* Wed Jan 14 2015 - Jonathan Dieter <jdieter@lesbg.com> - 3.18-2
+* Wed Jan 14 2015 - Jonathan Dieter <jdieter@lesbg.com> - 3.17-2
 - Remove clean section
 - Remove defattr in files list
 - Use license macro for COPYING
@@ -98,7 +103,6 @@ install -pm 644 %{SOURCE2} %{buildroot}%{_unitdir}
 - Remove /etc/default config file
 - Stop rmmoding when services stop
 - Remove unneeded After=syslog.target in services
-- Update to 3.18
 - Replace /usr/share with datadir macro in configure
 - Switch to make_install macro
 - When manually using install, preserve timestamps