diff --git a/systemd-mini.changes b/systemd-mini.changes
index 484dff47..fb756c60 100644
--- a/systemd-mini.changes
+++ b/systemd-mini.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Apr 23 14:58:47 CEST 2013 - fcrozat@suse.com
+
+- Use drop-in file to fix bnc#804158.
+
 -------------------------------------------------------------------
 Tue Apr 23 12:44:16 UTC 2013 - coolo@suse.com
 
diff --git a/systemd-mini.spec b/systemd-mini.spec
index 6fc0dd54..05e18590 100644
--- a/systemd-mini.spec
+++ b/systemd-mini.spec
@@ -554,10 +554,13 @@ mkdir -p %{buildroot}%{_prefix}/lib/systemd/system-sleep/
 mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/default.target.wants
 mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/dbus.target.wants
 
-src="%buildroot/%_libexecdir/systemd/system/getty@.service"
-dst="${src/@/@tty1}"
-cp "$src" "$dst"
-perl -i -pe 's{^# the VT is cleared.*}{}i;s{(^TTYVTDisallocate=.*)}{}' "$dst"
+# create drop-in to prevent tty1 to be cleared (bnc#804158)
+mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/getty@tty1.service.d/
+echo << EOF > %{buildroot}%{_prefix}/lib/systemd/system/getty@tty1.service.d/noclear.conf
+[Service]
+# ensure tty1 isn't cleared (bnc#804158)
+TTYVTDisallocate=no
+EOF
 
 %fdupes -s %{buildroot}%{_mandir}
 
@@ -792,6 +795,8 @@ fi
 %dir %{_prefix}/lib/systemd/system-sleep/
 %dir %{_prefix}/lib/systemd/system/default.target.wants
 %dir %{_prefix}/lib/systemd/system/dbus.target.wants
+%dir %{_prefix}/lib/systemd/system/getty@tty1.service.d
+%{_prefix}/lib/systemd/system/getty@tty1.service.d/noclear.conf
 %if ! 0%{?bootstrap}
 %{_prefix}/lib/systemd/system-generators/systemd-cryptsetup-generator
 %endif
diff --git a/systemd.changes b/systemd.changes
index 484dff47..fb756c60 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Apr 23 14:58:47 CEST 2013 - fcrozat@suse.com
+
+- Use drop-in file to fix bnc#804158.
+
 -------------------------------------------------------------------
 Tue Apr 23 12:44:16 UTC 2013 - coolo@suse.com
 
diff --git a/systemd.spec b/systemd.spec
index 688a9da6..e38d06b1 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -549,10 +549,13 @@ mkdir -p %{buildroot}%{_prefix}/lib/systemd/system-sleep/
 mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/default.target.wants
 mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/dbus.target.wants
 
-src="%buildroot/%_libexecdir/systemd/system/getty@.service"
-dst="${src/@/@tty1}"
-cp "$src" "$dst"
-perl -i -pe 's{^# the VT is cleared.*}{}i;s{(^TTYVTDisallocate=.*)}{}' "$dst"
+# create drop-in to prevent tty1 to be cleared (bnc#804158)
+mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/getty@tty1.service.d/
+echo << EOF > %{buildroot}%{_prefix}/lib/systemd/system/getty@tty1.service.d/noclear.conf
+[Service]
+# ensure tty1 isn't cleared (bnc#804158)
+TTYVTDisallocate=no
+EOF
 
 %fdupes -s %{buildroot}%{_mandir}
 
@@ -787,6 +790,8 @@ fi
 %dir %{_prefix}/lib/systemd/system-sleep/
 %dir %{_prefix}/lib/systemd/system/default.target.wants
 %dir %{_prefix}/lib/systemd/system/dbus.target.wants
+%dir %{_prefix}/lib/systemd/system/getty@tty1.service.d
+%{_prefix}/lib/systemd/system/getty@tty1.service.d/noclear.conf
 %if ! 0%{?bootstrap}
 %{_prefix}/lib/systemd/system-generators/systemd-cryptsetup-generator
 %endif