diff --git a/Makefile.am b/Makefile.am
index a86639d7a2..3389f436df 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -218,7 +218,6 @@ dist_systemunit_DATA = \
 	units/sys-kernel-debug.mount \
 	units/sys-kernel-security.automount \
 	units/sys-kernel-security.mount \
-	units/tmp.mount \
 	units/var-lock.mount \
 	units/var-run.mount \
 	units/hwclock-load.service \
diff --git a/TODO b/TODO
index 7b41702e73..287de70ace 100644
--- a/TODO
+++ b/TODO
@@ -1,9 +1,6 @@
 * check if bind mounts work:
     https://bugzilla.novell.com/show_bug.cgi?id=652762
 
-* /lib/systemd/system/tmp.mount conflicts with possible unrelated
-  fstab entry
-
 * oneshot services which do not remain: 'exited' instead of 'dead'?
   it should be visible in 'systemctl' that they have been run
 
diff --git a/units/tmp.mount b/units/tmp.mount
deleted file mode 100644
index 8d0b8afb17..0000000000
--- a/units/tmp.mount
+++ /dev/null
@@ -1,16 +0,0 @@
-#  This file is part of systemd.
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-
-[Unit]
-Description=Temporary Directory
-Before=local-fs.target
-
-[Mount]
-What=tmpfs
-Where=/tmp
-Type=tmpfs
-Options=mode=1777