diff --git a/extra/lirc/PKGBUILD b/extra/lirc/PKGBUILD
index c78a7ce08..b1842af61 100644
--- a/extra/lirc/PKGBUILD
+++ b/extra/lirc/PKGBUILD
@@ -8,7 +8,7 @@
 pkgbase=lirc
 pkgname=('lirc' 'lirc-utils')
 pkgver=0.9.0
-pkgrel=62
+pkgrel=63
 epoch=1
 arch=('i686' 'x86_64')
 url="http://www.lirc.org/"
@@ -21,7 +21,9 @@ source=(http://prdownloads.sourceforge.net/${pkgbase}/${pkgbase}-${pkgver}.tar.b
         lirc_atiusb-kfifo.patch
         kernel-2.6.39.patch
 	lirc.logrotate
-	lirc.service lircm.service irexec.service
+	lirc.service
+	lircm.service
+	irexec.service
 	lirc.tmpfiles
 	)
 md5sums=('b232aef26f23fe33ea8305d276637086'
@@ -29,9 +31,10 @@ md5sums=('b232aef26f23fe33ea8305d276637086'
          'b70cc9640505205446ec47b7d4779f38'
          '1f8b104a2365d9f93404b143f499059b'
          '087a7d102e1c96bf1179f38db2b0b237'
+         '9ee196bd03ea44af5a752fb0cc6ca96a'
          '3deb02604b37811d41816e9b4385fcc3'
-         '1c7ceace42da44f41e5a42b4dd3b3d76'
-         '121283a6de274e52ed86522aecd0f6e5'
+         'a9ab637e7207472e61e55a2fa75dc555'
+         '1847b9997685bc3ad2cf11bea4590a92'
          '07131d117fcfe9dcd50c453c3a5e9531'
          'febf25c154a7d36f01159e84f26c2d9a')
 
@@ -42,6 +45,12 @@ build() {
   patch -Np1 -i "${srcdir}/lirc_atiusb-kfifo.patch"
   patch -Np1 -i "${srcdir}/kernel-2.6.39.patch"
 
+  # use fixed instead of Courier w/xmode2, should be more prevalent on linux boxen
+  sed -i -e 's|char.*font1_name.*Courier.*$|char		font1_name[]="-misc-fixed-*-r-*-*-12-*-*-*-*-*-iso8859-1";|g' tools/xmode2.c
+
+  # use /dev/lirc0 by default instead of /dev/lirc
+  sed -i -e 's|#define DEV_LIRC	"lirc"|#define DEV_LIRC	"lirc0"|' config.h.in
+
   sed -i '/AC_PATH_XTRA/d' configure.ac
   sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADER/' configure.ac
   sed -e 's/@X_CFLAGS@//g' \
diff --git a/extra/lirc/lirc.service b/extra/lirc/lirc.service
index 2123348fd..a797d1661 100644
--- a/extra/lirc/lirc.service
+++ b/extra/lirc/lirc.service
@@ -1,11 +1,12 @@
 [Unit]
 Description=Linux Infrared Remote Control
+After=network.target
 
 [Service]
-ExecStartPre=/usr/bin/ln -sf /run/lirc/lircd /dev/lircd
-ExecStart=/usr/bin/lircd --pidfile=/run/lirc/lircd.pid
 Type=forking
 PIDFile=/run/lirc/lircd.pid
+ExecStart=/usr/sbin/lircd --driver=default --device=/dev/lirc0 
 
 [Install]
 WantedBy=multi-user.target
+
diff --git a/extra/lirc/lircm.service b/extra/lirc/lircm.service
index eedcf5d8f..c0b5e36b7 100644
--- a/extra/lirc/lircm.service
+++ b/extra/lirc/lircm.service
@@ -1,11 +1,12 @@
 [Unit]
 Description=LIRC Mouse
-After=lirc.service
-Wants=lirc.service
+Requires=lirc.service
+After=network.target lirc.service
 
 [Service]
-ExecStart=/usr/bin/lircmd -u
 Type=forking
+ExecStart=/usr/sbin/lircmd 
 
 [Install]
 WantedBy=multi-user.target
+