diff --git a/.gitignore b/.gitignore
index ba6d3b30e..3ee0de0b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,7 +35,7 @@ tags
 /mkinstalldirs
 /build
 /src/mpd
-/systemd/mpd.service
+/systemd/system/mpd.service
 /stamp-h1
 
 /src/dsd2pcm/dsd2pcm
diff --git a/Makefile.am b/Makefile.am
index 744b96603..029958adb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1449,8 +1449,8 @@ FILTER_LIBS = \
 
 if HAVE_SYSTEMD
 systemdsystemunit_DATA = \
-	systemd/mpd.socket \
-	systemd/mpd.service
+	systemd/system/mpd.socket \
+	systemd/system/mpd.service
 endif
 
 
diff --git a/configure.ac b/configure.ac
index 9277c5f71..84f9b686d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1905,7 +1905,7 @@ dnl Generate files
 dnl ---------------------------------------------------------------------------
 AC_CONFIG_FILES(Makefile)
 AC_CONFIG_FILES(doc/doxygen.conf)
-AC_CONFIG_FILES(systemd/mpd.service)
+AC_CONFIG_FILES(systemd/system/mpd.service)
 AC_OUTPUT
 
 echo 'MPD is ready for compilation, type "make" to begin.'
diff --git a/systemd/mpd.service.in b/systemd/system/mpd.service.in
similarity index 100%
rename from systemd/mpd.service.in
rename to systemd/system/mpd.service.in
diff --git a/systemd/mpd.socket b/systemd/system/mpd.socket
similarity index 100%
rename from systemd/mpd.socket
rename to systemd/system/mpd.socket