diff --git a/sddm/PKGBUILD b/sddm/PKGBUILD
index e6e1ec1ad..3510de42b 100644
--- a/sddm/PKGBUILD
+++ b/sddm/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=sddm
 pkgver=0.12.0
-pkgrel=4
+pkgrel=5
 pkgdesc='QML based X11 and Wayland display manager'
 arch=('x86_64')
 url='http://github.com/sddm/sddm'
@@ -18,17 +18,21 @@ backup=('usr/share/sddm/scripts/Xsetup'
         'etc/pam.d/sddm')
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/${pkgname}/${pkgname}/archive/v${pkgver}.tar.gz"
         'sddm.conf'
-        fix-segfault.patch::"https://github.com/davispuh/sddm/commit/671c11d0.patch")
+        fix-segfault.patch::"https://github.com/davispuh/sddm/commit/671c11d0.patch"
+        CVE-2015-0856.patch::"https://github.com/sddm/sddm/commit/4cfed6b0.patch")
 md5sums=('e3261ac93a50c71c973cc79b85387765'
-         'e5343e5886aef3c9e043c0b1100aa659'
-         '208f3b1b49792984989172dd809a03bf')
+         '59bf4124f43c8e1be1cd5eb15b642eb7'
+         '208f3b1b49792984989172dd809a03bf'
+         '80eb7eddd8d3d259a6c28e83b9394575')
 
 prepare() {
   cd ${srcdir}
 
-# Fix segfault https://github.com/sddm/sddm/issues/489
-  cd $pkgname-$pkgver
+  # Fix segfault https://github.com/sddm/sddm/issues/489
+  cd ${pkgname}-${pkgver}
   patch -p1 -i ../fix-segfault.patch
+  # Fix CVE-2015-0856
+  patch -p1 -i ../CVE-2015-0856.patch
 }
          
 build() {
@@ -48,5 +52,4 @@ package() {
   
   # set the default configuration, with heritage as theme
   install -m 644 -p ${srcdir}/sddm.conf ${pkgdir}/etc/
-} 
-
+}
diff --git a/sddm/sddm.conf b/sddm/sddm.conf
index 240ae816c..1ecaead07 100644
--- a/sddm/sddm.conf
+++ b/sddm/sddm.conf
@@ -16,7 +16,7 @@ HaltCommand=/usr/bin/systemctl poweroff
 # Initial NumLock state
 # Valid values: on|off|none
 # If property is set to none, numlock won't be changed
-Numlock=none
+Numlock=on
 
 # Reboot command
 RebootCommand=/usr/bin/systemctl reboot
@@ -68,7 +68,7 @@ DisplayCommand=/usr/share/sddm/scripts/Xsetup
 
 # Minimum VT
 # The lowest virtual terminal number that will be used.
-MinimumVT=1
+MinimumVT=7
 
 # X server path
 ServerPath=/usr/bin/X