diff --git a/dkms.changes b/dkms.changes
index 78f239e..1e607d1 100644
--- a/dkms.changes
+++ b/dkms.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Feb  1 09:50:43 UTC 2017 - bumblebee.obs@gmail.com
+
+- Start the dkms service before the display-manager service
+  for the nvidia modules.
+- Make the module build more secure (JPoortvliet@suse.de)
+
 -------------------------------------------------------------------
 Sun Jan 15 05:30:21 UTC 2017 - i@marguerite.su
 
diff --git a/dkms.service b/dkms.service
index 724dbfb..927e791 100644
--- a/dkms.service
+++ b/dkms.service
@@ -1,5 +1,6 @@
 [Unit]
 Description=Dynamic Kernel Modules System
+Before=display-manager.service
 
 [Service]
 Type=oneshot
diff --git a/dkms.spec b/dkms.spec
index 75baac7..17740c0 100644
--- a/dkms.spec
+++ b/dkms.spec
@@ -83,6 +83,14 @@ rm -rf %{buildroot}%{_sysconfdir}/rc.d/init.d/dkms_autoinstaller
 exit 0
 
 %post
+# make it more secure
+if [ ! -d %{_tmppath}/dkms ] ;
+then
+  mkdir -p %{_tmppath}/dkms
+  chmod 700 %{_tmppath}/dkms
+fi
+sed -i -e 's,# tmp_location="/tmp",tmp_location="%{_tmppath}/dkms",' %{_sysconfdir}/dkms/framework.conf
+
 # enable on initial install
 %service_add_post dkms.service
 exit 0