diff --git a/packages/x11/xserver/xorg-server/package.mk b/packages/x11/xserver/xorg-server/package.mk
index e819bfad99..aa80ee90f4 100644
--- a/packages/x11/xserver/xorg-server/package.mk
+++ b/packages/x11/xserver/xorg-server/package.mk
@@ -194,5 +194,7 @@ post_makeinstall_target() {
 
 post_install() {
   enable_service xorg-monitor.path
-  enable_service xorg-server.path
+  enable_service xorg.service
+#  enable_service xorg.path
+#  enable_service xorg.target
 }
diff --git a/packages/x11/xserver/xorg-server/system.d/xorg-monitor.path b/packages/x11/xserver/xorg-server/system.d/xorg-monitor.path
index bc7a118955..2fc1c9d40f 100644
--- a/packages/x11/xserver/xorg-server/system.d/xorg-monitor.path
+++ b/packages/x11/xserver/xorg-server/system.d/xorg-monitor.path
@@ -1,9 +1,9 @@
 [Unit]
 Description=Xorg configfile monitor
-After=xorg-server.service
+After=xorg.service
 
 [Path]
 PathModified=/run/openelec/debug.conf
 
 [Install]
-WantedBy=graphical.target
+WantedBy=xorg.target
diff --git a/packages/x11/xserver/xorg-server/system.d/xorg-monitor.service b/packages/x11/xserver/xorg-server/system.d/xorg-monitor.service
index e1d8f18df6..fdc80399c4 100644
--- a/packages/x11/xserver/xorg-server/system.d/xorg-monitor.service
+++ b/packages/x11/xserver/xorg-server/system.d/xorg-monitor.service
@@ -1,10 +1,10 @@
 [Unit]
 Description=Xorg configfile monitor
-After=xorg-server.service
+After=xorg.service
 
 [Service]
 Type=oneshot
 ExecStart=/bin/systemctl restart xorg-server.service
 
 [Install]
-WantedBy=graphical.target
+WantedBy=xorg.target
diff --git a/packages/x11/xserver/xorg-server/system.d/xorg-server.path b/packages/x11/xserver/xorg-server/system.d/xorg.path
similarity index 81%
rename from packages/x11/xserver/xorg-server/system.d/xorg-server.path
rename to packages/x11/xserver/xorg-server/system.d/xorg.path
index 38f64ab059..2878c46a72 100644
--- a/packages/x11/xserver/xorg-server/system.d/xorg-server.path
+++ b/packages/x11/xserver/xorg-server/system.d/xorg.path
@@ -5,4 +5,4 @@ Description=Xorg server configfile watcher
 PathExists=/run/openelec/xorg-settings.conf
 
 [Install]
-WantedBy=graphical.target
+WantedBy=xorg.target
diff --git a/packages/x11/xserver/xorg-server/system.d/xorg-server.service b/packages/x11/xserver/xorg-server/system.d/xorg.service
similarity index 72%
rename from packages/x11/xserver/xorg-server/system.d/xorg-server.service
rename to packages/x11/xserver/xorg-server/system.d/xorg.service
index b14488180f..7380937ee8 100644
--- a/packages/x11/xserver/xorg-server/system.d/xorg-server.service
+++ b/packages/x11/xserver/xorg-server/system.d/xorg.service
@@ -1,8 +1,9 @@
 [Unit]
 Description=Xorg Server
 Conflicts=rescue.service rescue.target installer.target
-Requires=graphical.target
-After=multi-user.target
+Before=xorg.target
+
+ConditionPathExists=/run/openelec/xorg-settings.conf
 
 [Service]
 Environment=DISPLAY=:0.0
@@ -10,6 +11,7 @@ EnvironmentFile=/run/openelec/xorg-settings.conf
 EnvironmentFile=-/run/openelec/debug.conf
 ExecStart=/usr/bin/Xorg vt01 $XORG_ARGS $XORG_DEBUG
 Restart=always
+# RestartSec=10
 
 [Install]
-WantedBy=graphical.target
+WantedBy=xorg.target
diff --git a/packages/x11/xserver/xorg-server/system.d/xorg.target b/packages/x11/xserver/xorg-server/system.d/xorg.target
new file mode 100644
index 0000000000..167f2dc336
--- /dev/null
+++ b/packages/x11/xserver/xorg-server/system.d/xorg.target
@@ -0,0 +1,4 @@
+[Unit]
+Description=The basic Xorg server
+Conflicts=installer.target textmode.target rescue.target
+Before=graphical.target
diff --git a/packages/x11/xserver/xorg-server/udev.d/97-xorg.rules b/packages/x11/xserver/xorg-server/udev.d/97-xorg.rules
index 8c21625705..7bfb232e45 100644
--- a/packages/x11/xserver/xorg-server/udev.d/97-xorg.rules
+++ b/packages/x11/xserver/xorg-server/udev.d/97-xorg.rules
@@ -45,6 +45,6 @@ GOTO="end_video"
 
 # configure Xorg
 LABEL="configure_xorg"
-ENV{xorg_driver}=="?*", RUN+="xorg-configure"
+ENV{xorg_driver}=="?*", RUN+="xorg-configure", TAG+="systemd", ENV{SYSTEMD_WANTS}+="xorg.target"
 
 LABEL="end_video"