6 files changed, 8 insertions, 37 deletions
diff --git a/contrib/systemd/README.md b/contrib/systemd/README.md
index 9f1d37792..480596915 100644
--- a/contrib/systemd/README.md
+++ b/contrib/systemd/README.md
@@ -11,9 +11,9 @@
 Assuming the status messages show no errors, the libpod service is ready to respond to the APIv2 on the unix domain socket `/run/podman/podman.sock`
 
 ### podman.service
-You can refer to [this example](https://github.com/containers/libpod/blob/master/contrib/systemd/system/podman.service) for a sample podman.service file.
+You can refer to [this example](https://github.com/containers/podman/blob/master/contrib/systemd/system/podman.service) for a sample podman.service file.
 ### podman.socket
-You can refer to [this example](https://github.com/containers/libpod/blob/master/contrib/systemd/system/podman.socket) for a sample podman.socket file.
+You can refer to [this example](https://github.com/containers/podman/blob/master/contrib/systemd/system/podman.socket) for a sample podman.socket file.
 
 ## user (podman service run as given user aka "rootless")
 
@@ -26,7 +26,7 @@ You can refer to [this example](https://github.com/containers/libpod/blob/master
 Assuming the status messages show no errors, the libpod service is ready to respond to the APIv2 on the unix domain socket `/run/user/$(id -u)/podman/podman.sock`
 
 ### podman.service
-You can refer to [this example](https://github.com/containers/libpod/blob/master/contrib/systemd/user/podman.service) for a rootless podman.service file.
+You can refer to [this example](https://github.com/containers/podman/blob/master/contrib/systemd/user/podman.service) for a rootless podman.service file.
 
 ### podman.socket
-You can refer to [this example](https://github.com/containers/libpod/blob/master/contrib/systemd/user/podman.socket) for a rootless podman.socket file.
+You can refer to [this example](https://github.com/containers/podman/blob/master/contrib/systemd/user/podman.socket) for a rootless podman.socket file.
diff --git a/contrib/systemd/system/podman.service b/contrib/systemd/system/podman.service
index eaa2ec437..4a63735a3 100644
--- a/contrib/systemd/system/podman.service
+++ b/contrib/systemd/system/podman.service
@@ -2,15 +2,12 @@
 Description=Podman API Service
 Requires=podman.socket
 After=podman.socket
-Documentation=man:podman-api(1)
+Documentation=man:podman-system-service(1)
 StartLimitIntervalSec=0
 
 [Service]
-Type=oneshot
-Environment=REGISTRIES_CONFIG_PATH=/etc/containers/registries.conf
+Type=simple
 ExecStart=/usr/bin/podman system service
-TimeoutStopSec=30
-KillMode=process
 
 [Install]
 WantedBy=multi-user.target
diff --git a/contrib/systemd/system/podman.socket b/contrib/systemd/system/podman.socket
index 8b22e31e4..397058ee4 100644
--- a/contrib/systemd/system/podman.socket
+++ b/contrib/systemd/system/podman.socket
@@ -1,6 +1,6 @@
 [Unit]
 Description=Podman API Socket
-Documentation=man:podman-api(1)
+Documentation=man:podman-system-service(1)
 
 [Socket]
 ListenStream=%t/podman/podman.sock
diff --git a/contrib/systemd/user b/contrib/systemd/user
new file mode 120000
index 000000000..3f3d9896b
--- /dev/null
+++ b/contrib/systemd/user
@@ -0,0 +1 @@
+./system/
+\ No newline at end of file
diff --git a/contrib/systemd/user/podman.service b/contrib/systemd/user/podman.service
deleted file mode 100644
index eaa2ec437..000000000
--- a/contrib/systemd/user/podman.service
+++ /dev/null
@@ -1,17 +0,0 @@
-[Unit]
-Description=Podman API Service
-Requires=podman.socket
-After=podman.socket
-Documentation=man:podman-api(1)
-StartLimitIntervalSec=0
-
-[Service]
-Type=oneshot
-Environment=REGISTRIES_CONFIG_PATH=/etc/containers/registries.conf
-ExecStart=/usr/bin/podman system service
-TimeoutStopSec=30
-KillMode=process
-
-[Install]
-WantedBy=multi-user.target
-Also=podman.socket
diff --git a/contrib/systemd/user/podman.socket b/contrib/systemd/user/podman.socket
deleted file mode 100644
index 8b22e31e4..000000000
--- a/contrib/systemd/user/podman.socket
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Podman API Socket
-Documentation=man:podman-api(1)
-
-[Socket]
-ListenStream=%t/podman/podman.sock
-SocketMode=0660
-
-[Install]
-WantedBy=sockets.target