diff --git a/MAINTAINERS b/MAINTAINERS
index 1e9c29f..2497a36 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -95,7 +95,7 @@
 
 Master-worker
 Maintainer: William Lallemand <wlallemand@haproxy.com>
-Note: Please CC William when touching src/haproxy.c and contrib/systemd
+Note: Please CC William when touching src/haproxy.c and admin/systemd
 
 Multi-threading
 Maintainer: Christopher Faulet <cfaulet@haproxy.com>
diff --git a/Makefile b/Makefile
index 452ab8d..53cfc9d 100644
--- a/Makefile
+++ b/Makefile
@@ -994,10 +994,11 @@
 
 clean:
 	$(Q)rm -f *.[oas] src/*.[oas] haproxy test .build_opts .build_opts.new
-	$(Q)for dir in . src dev/* include/* doc; do rm -f $$dir/*~ $$dir/*.rej $$dir/core; done
+	$(Q)for dir in . src dev/* admin/* include/* doc; do rm -f $$dir/*~ $$dir/*.rej $$dir/core; done
 	$(Q)rm -f haproxy-$(VERSION).tar.gz haproxy-$(VERSION)$(SUBVERS)$(EXTRAVERSION).tar.gz
 	$(Q)rm -f haproxy-$(VERSION) haproxy-$(VERSION)$(SUBVERS)$(EXTRAVERSION) nohup.out gmon.out
-	$(Q)rm -f {dev,contrib}/*/*.[oas] {dev,contrib}/*/*/*.[oas] {dev,contrib}/*/*/*/*.[oas]
+	$(Q)rm -f {admin,dev,contrib}/*/*.[oas] {admin,dev,contrib}/*/*/*.[oas] {admin,dev,contrib}/*/*/*/*.[oas]
+	$(Q)rm -f admin/iprange/iprange admin/iprange/ip6range
 	$(Q)rm -f contrib/halog/halog dev/flags/flags dev/poll/poll dev/tcploop/tcploop
 	$(Q)rm -f dev/hpack/decode dev/hpack/gen-enc dev/hpack/gen-rht
 
diff --git a/contrib/iprange/Makefile b/admin/iprange/Makefile
similarity index 100%
rename from contrib/iprange/Makefile
rename to admin/iprange/Makefile
diff --git a/contrib/iprange/ip6range.c b/admin/iprange/ip6range.c
similarity index 100%
rename from contrib/iprange/ip6range.c
rename to admin/iprange/ip6range.c
diff --git a/contrib/iprange/iprange.c b/admin/iprange/iprange.c
similarity index 100%
rename from contrib/iprange/iprange.c
rename to admin/iprange/iprange.c
diff --git a/contrib/netsnmp-perl/README b/admin/netsnmp-perl/README
similarity index 100%
rename from contrib/netsnmp-perl/README
rename to admin/netsnmp-perl/README
diff --git a/contrib/netsnmp-perl/cacti_data_query_haproxy_backends.xml b/admin/netsnmp-perl/cacti_data_query_haproxy_backends.xml
similarity index 100%
rename from contrib/netsnmp-perl/cacti_data_query_haproxy_backends.xml
rename to admin/netsnmp-perl/cacti_data_query_haproxy_backends.xml
diff --git a/contrib/netsnmp-perl/cacti_data_query_haproxy_frontends.xml b/admin/netsnmp-perl/cacti_data_query_haproxy_frontends.xml
similarity index 100%
rename from contrib/netsnmp-perl/cacti_data_query_haproxy_frontends.xml
rename to admin/netsnmp-perl/cacti_data_query_haproxy_frontends.xml
diff --git a/contrib/netsnmp-perl/haproxy.pl b/admin/netsnmp-perl/haproxy.pl
similarity index 100%
rename from contrib/netsnmp-perl/haproxy.pl
rename to admin/netsnmp-perl/haproxy.pl
diff --git a/contrib/netsnmp-perl/haproxy_backend.xml b/admin/netsnmp-perl/haproxy_backend.xml
similarity index 100%
rename from contrib/netsnmp-perl/haproxy_backend.xml
rename to admin/netsnmp-perl/haproxy_backend.xml
diff --git a/contrib/netsnmp-perl/haproxy_frontend.xml b/admin/netsnmp-perl/haproxy_frontend.xml
similarity index 100%
rename from contrib/netsnmp-perl/haproxy_frontend.xml
rename to admin/netsnmp-perl/haproxy_frontend.xml
diff --git a/contrib/netsnmp-perl/haproxy_socket.xml b/admin/netsnmp-perl/haproxy_socket.xml
similarity index 100%
rename from contrib/netsnmp-perl/haproxy_socket.xml
rename to admin/netsnmp-perl/haproxy_socket.xml
diff --git a/contrib/release-estimator/README.md b/admin/release-estimator/README.md
similarity index 100%
rename from contrib/release-estimator/README.md
rename to admin/release-estimator/README.md
diff --git a/contrib/release-estimator/release-estimator.py b/admin/release-estimator/release-estimator.py
similarity index 100%
rename from contrib/release-estimator/release-estimator.py
rename to admin/release-estimator/release-estimator.py
diff --git a/contrib/selinux/README b/admin/selinux/README
similarity index 100%
rename from contrib/selinux/README
rename to admin/selinux/README
diff --git a/contrib/selinux/haproxy.fc b/admin/selinux/haproxy.fc
similarity index 100%
rename from contrib/selinux/haproxy.fc
rename to admin/selinux/haproxy.fc
diff --git a/contrib/selinux/haproxy.if b/admin/selinux/haproxy.if
similarity index 100%
rename from contrib/selinux/haproxy.if
rename to admin/selinux/haproxy.if
diff --git a/contrib/selinux/haproxy.te b/admin/selinux/haproxy.te
similarity index 100%
rename from contrib/selinux/haproxy.te
rename to admin/selinux/haproxy.te
diff --git a/contrib/syntax-highlight/haproxy.vim b/admin/syntax-highlight/haproxy.vim
similarity index 100%
rename from contrib/syntax-highlight/haproxy.vim
rename to admin/syntax-highlight/haproxy.vim
diff --git a/contrib/systemd/Makefile b/admin/systemd/Makefile
similarity index 100%
rename from contrib/systemd/Makefile
rename to admin/systemd/Makefile
diff --git a/contrib/systemd/haproxy.service.in b/admin/systemd/haproxy.service.in
similarity index 100%
rename from contrib/systemd/haproxy.service.in
rename to admin/systemd/haproxy.service.in
diff --git a/contrib/wireshark-dissectors/peers/Makefile b/admin/wireshark-dissectors/peers/Makefile
similarity index 100%
rename from contrib/wireshark-dissectors/peers/Makefile
rename to admin/wireshark-dissectors/peers/Makefile
diff --git a/contrib/wireshark-dissectors/peers/README b/admin/wireshark-dissectors/peers/README
similarity index 100%
rename from contrib/wireshark-dissectors/peers/README
rename to admin/wireshark-dissectors/peers/README
diff --git a/contrib/wireshark-dissectors/peers/packet-happp.c b/admin/wireshark-dissectors/peers/packet-happp.c
similarity index 100%
rename from contrib/wireshark-dissectors/peers/packet-happp.c
rename to admin/wireshark-dissectors/peers/packet-happp.c
diff --git a/contrib/wireshark-dissectors/peers/wireshark.happp.dissector.patch b/admin/wireshark-dissectors/peers/wireshark.happp.dissector.patch
similarity index 100%
rename from contrib/wireshark-dissectors/peers/wireshark.happp.dissector.patch
rename to admin/wireshark-dissectors/peers/wireshark.happp.dissector.patch