diff --git a/debian/pagure-ev-server.init b/debian/pagure-ev-server.init
index b3c230d..12228ca 100644
--- a/debian/pagure-ev-server.init
+++ b/debian/pagure-ev-server.init
@@ -18,7 +18,7 @@ fi
 # Author: Sergio Durigan Junior <sergiodj@sergiodj.net>
 
 DESC="pagure"
-DAEMON="/usr/lib/pagure/pagure-ev-server/pagure-stream-server.py"
+DAEMON="/usr/share/pagure-ev-server/bin/pagure-stream-server.py"
 PIDFILE="/var/run/pagure/pagure-ev-server.pid"
 U="git"
 
diff --git a/debian/pagure-ev-server.install b/debian/pagure-ev-server.install
index 6a420c1..13c1356 100644
--- a/debian/pagure-ev-server.install
+++ b/debian/pagure-ev-server.install
@@ -1 +1 @@
-ev-server/pagure-stream-server.py debian/tmp/usr/lib/pagure/pagure-ev-server/
+ev-server/pagure-stream-server.py debian/tmp/usr/share/pagure-ev-server/bin/
diff --git a/debian/pagure-ev-server.service b/debian/pagure-ev-server.service
index 1f32800..946289b 100644
--- a/debian/pagure-ev-server.service
+++ b/debian/pagure-ev-server.service
@@ -4,7 +4,7 @@ After=redis.target
 Documentation=https://pagure.io/pagure
 
 [Service]
-ExecStart=/usr/lib/pagure/pagure-ev-server/pagure-stream-server.py
+ExecStart=/usr/share/pagure-ev-server/bin/pagure-stream-server.py
 Type=simple
 User=git
 Group=git
diff --git a/debian/pagure-milters.init b/debian/pagure-milters.init
index ee99e48..018a730 100644
--- a/debian/pagure-milters.init
+++ b/debian/pagure-milters.init
@@ -18,7 +18,7 @@ fi
 # Author: Sergio Durigan Junior <sergiodj@sergiodj.net>
 
 DESC="pagure"
-DAEMON="/usr/bin/python2 /usr/share/pagure/pagure-milters/comment_email_milter.py"
+DAEMON="/usr/bin/python2 /usr/share/pagure-milters/bin/comment_email_milter.py"
 PIDFILE="/var/run/pagure/pagure-milters.pid"
 
 test -x "${DAEMON}" || exit 0
diff --git a/debian/pagure-milters.install b/debian/pagure-milters.install
index 98d6f84..2092b65 100644
--- a/debian/pagure-milters.install
+++ b/debian/pagure-milters.install
@@ -1 +1 @@
-milters/comment_email_milter.py debian/tmp/usr/share/pagure/pagure-milters/
+milters/comment_email_milter.py debian/tmp/usr/share/pagure-milters/bin/
diff --git a/debian/pagure-milters.service b/debian/pagure-milters.service
index b3c195f..295616d 100644
--- a/debian/pagure-milters.service
+++ b/debian/pagure-milters.service
@@ -4,7 +4,7 @@ After=postfix.target
 Documentation=https://pagure.io/pagure
 
 [Service]
-ExecStart=/usr/bin/python2 /usr/share/pagure/pagure-milters/comment_email_milter.py
+ExecStart=/usr/bin/python2 /usr/share/pagure-milters/bin/comment_email_milter.py
 Type=simple
 User=postfix
 Group=postfix
diff --git a/debian/pagure-webhook-server.init b/debian/pagure-webhook-server.init
index 60e406d..72ee3f7 100644
--- a/debian/pagure-webhook-server.init
+++ b/debian/pagure-webhook-server.init
@@ -18,7 +18,7 @@ fi
 # Author: Sergio Durigan Junior <sergiodj@sergiodj.net>
 
 DESC="pagure"
-DAEMON="/usr/lib/pagure/pagure-webhook-server/pagure-webhook-server.py"
+DAEMON="/usr/share/pagure-webhook-server/bin/pagure-webhook-server.py"
 PIDFILE="/var/run/pagure/pagure-webhook-server.pid"
 U="git"
 
diff --git a/debian/pagure-webhook-server.install b/debian/pagure-webhook-server.install
index a771fa5..fe77354 100644
--- a/debian/pagure-webhook-server.install
+++ b/debian/pagure-webhook-server.install
@@ -1 +1 @@
-webhook-server/pagure-webhook-server.py debian/tmp/usr/lib/pagure/pagure-webhook-server/
+webhook-server/pagure-webhook-server.py debian/tmp/usr/share/pagure-webhook-server/bin/
diff --git a/debian/pagure-webhook-server.service b/debian/pagure-webhook-server.service
index 6267616..feb4d0e 100644
--- a/debian/pagure-webhook-server.service
+++ b/debian/pagure-webhook-server.service
@@ -4,7 +4,7 @@ After=redis.target
 Documentation=https://pagure.io/pagure
 
 [Service]
-ExecStart=/usr/lib/pagure/pagure-webhook-server/pagure-webhook-server.py
+ExecStart=/usr/share/pagure-webhook-server/bin/pagure-webhook-server.py
 Type=simple
 User=git
 Group=git
diff --git a/debian/rules b/debian/rules
index 7deaee9..b697a13 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,3 +9,7 @@ override_dh_auto_build:
 	dh_auto_build
 	PYTHONPATH=$(CURDIR) http_proxy='127.0.0.1:9' \
 	  make -C doc/ html man
+
+override_dh_auto_install:
+	dh_auto_install
+	$(CHMOD) 0755 debian/tmp/usr/share/pagure-milters/bin/comment_email_milter.py