diff --git a/sys-apps/usbguard/Manifest b/sys-apps/usbguard/Manifest
index e1b5247..ad56199 100644
--- a/sys-apps/usbguard/Manifest
+++ b/sys-apps/usbguard/Manifest
@@ -1,2 +1,13 @@
-AUX openrc-support.patch 1979 BLAKE2B d774ee7bb7fca81376b806d162915b034c458af704d0bd0478a37c1f0246dbba45dc8588f7668f51851b8bae7be49d2456d99da797f1f6aae95672ee75bb1342 SHA512 1a3723f983b5544ece63e599d956c4cec0ef078c0bf193f62eabef640a84116cf07730bb03e1fe6fae266f503c496ee7e15ed09243e1607617cf5f6f35a9ed55
-EBUILD usbguard-9999.ebuild 2588 BLAKE2B 61779e6a28239f593622af1dd9b77a55681d4008d717db6ba0f2c3ef9f43ee44609c519f22b32b8d26e04737ed9e1e7199f293a9797131a14f2e52d19bc4b8d0 SHA512 dedab155603b31a3126a8244416fd278d143ba39d9eee29d36de4fbedcc6abf4dff0e7fae8c123c85c20d2ee0914b3d98b5a9cf0e1934b0c0a225031a407bfc0
+AUX openRC.old/conf.d/usbguard 132 BLAKE2B cb19420298b5c0c629e9b92244c5df4629d803a8835cf9378ead805e539b748c969a77312a8164fe9c96278c4396c537e54e8e28f78aae69776109b52fe6e65e SHA512 e86bad195537e4c42fd92dcd1685be411f4a6807b50050318f07f8550fcf5745a9886d58b7fff5f878fe05a993a465b36434c91576651f1e79e994db1c9037f9
+AUX openRC.old/conf.d/usbguard-dbus 101 BLAKE2B 2c384b1cd0cbe1b696fb5ce449e248322541fdfc80bfe7c44024998edc4119cdc0d4ef7fdff0d8c78d55fffe4a0af2ab802e12ff2c70953949d7dc660c142d56 SHA512 daad24cff716655d1f9e90243f099f394b173115fc0217a625368cd1959b5d526e82173bdbbfebd7f61a8404c5c347759a77a6c8dae5c2fedfd966728ba7adb5
+AUX openRC.old/usbguard 766 BLAKE2B 5599b931f14623468b480214fc433d7d358651d72c67c476d06b308113c8bfb8fbf398e40d7077841c3a0173ee0b682d3bc17899371a8e291315874d7d19c888 SHA512 e1a5321e4b62b5fd8b16ea7345274d39cedf82077e1644e987dd4a1a9649f190a5aa68e03e7e5133238be9e610fffcb8fddaeded1891529918ac8c8ebf727dc1
+AUX openRC.old/usbguard-dbus 523 BLAKE2B 3b453ef383ec2bced8790837b75b8886f16e62ce61bcc284e99e8dc873a944e726794595e770c41225acad8af6b4e409cbec85b52c5d2a671903948653b8ea8d SHA512 1bf1db53d654221f5b10b8480bf667db008355c75eb0a64d30aec43fd3d6e493645b750bb96547ff967724efec1a9312da089385c435549efe1c701ef27f6fdf
+AUX openRC/conf.d/usbguard 132 BLAKE2B cb19420298b5c0c629e9b92244c5df4629d803a8835cf9378ead805e539b748c969a77312a8164fe9c96278c4396c537e54e8e28f78aae69776109b52fe6e65e SHA512 e86bad195537e4c42fd92dcd1685be411f4a6807b50050318f07f8550fcf5745a9886d58b7fff5f878fe05a993a465b36434c91576651f1e79e994db1c9037f9
+AUX openRC/conf.d/usbguard-dbus 101 BLAKE2B 2c384b1cd0cbe1b696fb5ce449e248322541fdfc80bfe7c44024998edc4119cdc0d4ef7fdff0d8c78d55fffe4a0af2ab802e12ff2c70953949d7dc660c142d56 SHA512 daad24cff716655d1f9e90243f099f394b173115fc0217a625368cd1959b5d526e82173bdbbfebd7f61a8404c5c347759a77a6c8dae5c2fedfd966728ba7adb5
+AUX openRC/usbguard 766 BLAKE2B 5599b931f14623468b480214fc433d7d358651d72c67c476d06b308113c8bfb8fbf398e40d7077841c3a0173ee0b682d3bc17899371a8e291315874d7d19c888 SHA512 e1a5321e4b62b5fd8b16ea7345274d39cedf82077e1644e987dd4a1a9649f190a5aa68e03e7e5133238be9e610fffcb8fddaeded1891529918ac8c8ebf727dc1
+AUX openRC/usbguard-dbus 523 BLAKE2B 3b453ef383ec2bced8790837b75b8886f16e62ce61bcc284e99e8dc873a944e726794595e770c41225acad8af6b4e409cbec85b52c5d2a671903948653b8ea8d SHA512 1bf1db53d654221f5b10b8480bf667db008355c75eb0a64d30aec43fd3d6e493645b750bb96547ff967724efec1a9312da089385c435549efe1c701ef27f6fdf
+AUX usbguard 766 BLAKE2B 5599b931f14623468b480214fc433d7d358651d72c67c476d06b308113c8bfb8fbf398e40d7077841c3a0173ee0b682d3bc17899371a8e291315874d7d19c888 SHA512 e1a5321e4b62b5fd8b16ea7345274d39cedf82077e1644e987dd4a1a9649f190a5aa68e03e7e5133238be9e610fffcb8fddaeded1891529918ac8c8ebf727dc1
+AUX usbguard-dbus 523 BLAKE2B 3b453ef383ec2bced8790837b75b8886f16e62ce61bcc284e99e8dc873a944e726794595e770c41225acad8af6b4e409cbec85b52c5d2a671903948653b8ea8d SHA512 1bf1db53d654221f5b10b8480bf667db008355c75eb0a64d30aec43fd3d6e493645b750bb96547ff967724efec1a9312da089385c435549efe1c701ef27f6fdf
+AUX usbguard-dbus.conf 101 BLAKE2B 2c384b1cd0cbe1b696fb5ce449e248322541fdfc80bfe7c44024998edc4119cdc0d4ef7fdff0d8c78d55fffe4a0af2ab802e12ff2c70953949d7dc660c142d56 SHA512 daad24cff716655d1f9e90243f099f394b173115fc0217a625368cd1959b5d526e82173bdbbfebd7f61a8404c5c347759a77a6c8dae5c2fedfd966728ba7adb5
+AUX usbguard.conf 132 BLAKE2B cb19420298b5c0c629e9b92244c5df4629d803a8835cf9378ead805e539b748c969a77312a8164fe9c96278c4396c537e54e8e28f78aae69776109b52fe6e65e SHA512 e86bad195537e4c42fd92dcd1685be411f4a6807b50050318f07f8550fcf5745a9886d58b7fff5f878fe05a993a465b36434c91576651f1e79e994db1c9037f9
+EBUILD usbguard-9999.ebuild 2598 BLAKE2B 49c7ce0eec5e9ffea223fdc7e137a410d1763256f0552c9848ba34eaae0c07cccea219cf847c36daeb33e354e608738e1dffd46d29dc393170f3dadddae93c77 SHA512 3f1b92d238f959cdac86ed1a543a5c62b3fcfa654a827a40c924795f128bb15dd1fea3feb472babc23f3c7cf9986a6da37c8231f8e27edb60e72969706809b00
diff --git a/sys-apps/usbguard/files/openRC/conf.d/usbguard b/sys-apps/usbguard/files/openRC/conf.d/usbguard
new file mode 100644
index 0000000..f444bbe
--- /dev/null
+++ b/sys-apps/usbguard/files/openRC/conf.d/usbguard
@@ -0,0 +1,2 @@
+# You can use the following variable to append options to the usbguard daemon command line. see $ man usbguard-deamon
+# APPEND=""  
diff --git a/sys-apps/usbguard/files/openRC/conf.d/usbguard-dbus b/sys-apps/usbguard/files/openRC/conf.d/usbguard-dbus
new file mode 100644
index 0000000..aa01099
--- /dev/null
+++ b/sys-apps/usbguard/files/openRC/conf.d/usbguard-dbus
@@ -0,0 +1,2 @@
+#Options, by default contains -s, which tell the dbus bridge to listen on the system bus
+APPEND="-s"
diff --git a/sys-apps/usbguard/files/openRC/usbguard b/sys-apps/usbguard/files/openRC/usbguard
new file mode 100644
index 0000000..7297931
--- /dev/null
+++ b/sys-apps/usbguard/files/openRC/usbguard
@@ -0,0 +1,29 @@
+#!/sbin/openrc-run
+
+depend() {
+    need localmount
+    after consolekit
+    after bootmisc
+    use logger
+    provide usb-access-control
+    provide usbguard
+}
+
+start_pre() {
+    ebegin "Pre-start security checks for usbguard"
+    checkpath --directory --owner root:root /etc/usbguard/
+    checkpath --file --owner root:root --mode 0600 /etc/usbguard/usbguard-daemon.conf /etc/usbguard/rules.conf
+    eend $?
+}
+
+start() {
+    ebegin "Starting usbguard daemon"
+    start-stop-daemon --start --pidfile /var/run/usbguard.pid --exec /usr/sbin/usbguard-daemon -- -f -s -K $APPEND
+    eend $?
+}
+
+stop() {
+    ebegin "Stopping usbguard daemon" 
+    start-stop-daemon --stop --pidfile /var/run/usbguard.pid --exec /usr/sbin/usbguard-daemon -- -f -s -K $APPEND
+    eend $?
+}
diff --git a/sys-apps/usbguard/files/openRC/usbguard-dbus b/sys-apps/usbguard/files/openRC/usbguard-dbus
new file mode 100644
index 0000000..bfe8eab
--- /dev/null
+++ b/sys-apps/usbguard/files/openRC/usbguard-dbus
@@ -0,0 +1,20 @@
+#!/sbin/openrc-run
+
+depend() {
+    need localmount
+    need dbus
+    need usbguard
+    need usb-access-control
+}
+
+start() {
+    ebegin "Starting usbguard dbus bridge"
+    start-stop-daemon --start --background --make-pidfile --pidfile /var/run/usbguard-dbus.pid --exec /usr/sbin/usbguard-dbus -- $APPEND
+    eend $?
+}
+
+stop() {
+    ebegin "Stopping usbguard dbus bridge" 
+    start-stop-daemon --stop --background --make-pidfile --pidfile /var/run/usbguard-dbus.pid  --exec /usr/sbin/usbguard-dbus -- $APPEND
+    eend $?
+}
diff --git a/sys-apps/usbguard/files/openrc-support.patch b/sys-apps/usbguard/files/openrc-support.patch
deleted file mode 100644
index 3694bcb..0000000
--- a/sys-apps/usbguard/files/openrc-support.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Les fichiers binaires usbguard/.git/index et usbguard-tmp/.git/index sont différents
-diff -crB --new-file usbguard/openRC/conf.d/usbguard-dbus usbguard-tmp/openRC/conf.d/usbguard-dbus
-*** usbguard/openRC/conf.d/usbguard-dbus	1970-01-01 01:00:00.000000000 +0100
---- usbguard-tmp/openRC/conf.d/usbguard-dbus	2018-04-27 10:12:23.721001263 +0200
-***************
-*** 0 ****
---- 1,2 ----
-+ #Options, by default contains -s, which tell the dbus bridge to listen on the system bus
-+ APPEND="-s"
-diff -crB --new-file usbguard/openRC/usbguard usbguard-tmp/openRC/usbguard
-*** usbguard/openRC/usbguard	2018-04-27 10:04:01.200283636 +0200
---- usbguard-tmp/openRC/usbguard	2018-04-27 10:13:32.168145556 +0200
-***************
-*** 1,12 ****
-  #!/sbin/openrc-run
-  
-  depend() {
-- #  (Dependency information)
-      need localmount
-      after consolekit
-      after bootmisc
-      use logger
-      provide usb-access-control
-  }
-  
-  start_pre() {
---- 1,12 ----
-  #!/sbin/openrc-run
-  
-  depend() {
-      need localmount
-      after consolekit
-      after bootmisc
-      use logger
-      provide usb-access-control
-+     provide usbguard
-  }
-  
-  start_pre() {
-diff -crB --new-file usbguard/openRC/usbguard-dbus usbguard-tmp/openRC/usbguard-dbus
-*** usbguard/openRC/usbguard-dbus	1970-01-01 01:00:00.000000000 +0100
---- usbguard-tmp/openRC/usbguard-dbus	2018-04-27 10:11:17.633827466 +0200
-***************
-*** 0 ****
---- 1,20 ----
-+ #!/sbin/openrc-run
-+ 
-+ depend() {
-+     need localmount
-+     need dbus
-+     need usbguard
-+     need usb-access-control
-+ }
-+ 
-+ start() {
-+     ebegin "Starting usbguard dbus bridge"
-+     start-stop-daemon --start --background --make-pidfile --pidfile /var/run/usbguard-dbus.pid --exec /usr/sbin/usbguard-dbus -- $APPEND
-+     eend $?
-+ }
-+ 
-+ stop() {
-+     ebegin "Stopping usbguard dbus bridge" 
-+     start-stop-daemon --stop --background --make-pidfile --pidfile /var/run/usbguard-dbus.pid  --exec /usr/sbin/usbguard-dbus -- $APPEND
-+     eend $?
-+ }
diff --git a/sys-apps/usbguard/usbguard-9999.ebuild b/sys-apps/usbguard/usbguard-9999.ebuild
index 5c31a78..b43b736 100644
--- a/sys-apps/usbguard/usbguard-9999.ebuild
+++ b/sys-apps/usbguard/usbguard-9999.ebuild
@@ -58,15 +58,15 @@ REQUIRED_USE="
 		)
 		?? ( qt4 qt5 )"
 		
-PATCHES=(
-	"${FILESDIR}/openrc-support.patch"
-)
+#PATCHES=(
+#	"${FILESDIR}/openrc-support.patch"
+#)
 		
 
 src_prepare() {
 	default
 	eautoreconf
-	eapply "${WORKDIR}"/openrc-support.patch
+	#eapply "${WORKDIR}"/openrc-support.patch
 }
 
 src_configure() {
@@ -115,12 +115,12 @@ src_install() {
 		systemd_dounit usbguard.service
 	fi
 
-	doinitd "${WORKDIR}"/openRC/usbguard
-	doinitd "${WORKDIR}"/openRC/usbguard-dbus
-	doconfd "${WORKDIR}"/openRC/conf.d/usbguard
-	doconfd "${WORKDIR}"/openRC/conf.d/usbguard-dbus
+	doinitd "${FILESDIR}"/openRC/usbguard
+	doinitd "${FILESDIR}"/openRC/usbguard-dbus
+	doconfd "${FILESDIR}"/openRC/conf.d/usbguard
+	doconfd "${FILESDIR}"/openRC/conf.d/usbguard-dbus
 	
-	insinto /etc/usbguard
+	insinto "/etc/usbguard"
 	doins usbguard-daemon.conf
 }