diff --git a/elements/apt-mirror/10-deprecate-apt-mirror b/elements/apt-mirror/10-deprecate-apt-mirror
new file mode 100644
index 0000000000..ce4cc41956
--- /dev/null
+++ b/elements/apt-mirror/10-deprecate-apt-mirror
@@ -0,0 +1,3 @@
+if [ -n "${UBUNTU_MIRROR:-}" ]; then
+    echo "DEPRECATED WARNING: Use of apt-mirror element is deprecated. See http://docs.openstack.org/developer/diskimage-builder/elements/ubuntu/README.html and http://docs.openstack.org/developer/diskimage-builder/elements/apt-sources/README.html for alternate methods of setting an ubuntu mirror."
+fi
diff --git a/elements/apt-mirror/README.rst b/elements/apt-mirror/README.rst
index c4259092af..dd2ca99de8 100644
--- a/elements/apt-mirror/README.rst
+++ b/elements/apt-mirror/README.rst
@@ -1,6 +1,13 @@
 This element enables the use of a mirror for updating Ubuntu cloud images.
 Using a local mirror increases the speed of building the image.
 
+Note: This element is deprectated in favor of the diskimage-builder methods
+for setting a mirror. See
+http://docs.openstack.org/developer/diskimage-builder/elements/ubuntu/README.html
+and
+http://docs.openstack.org/developer/diskimage-builder/elements/apt-sources/README.html
+for more information.
+
 The Ubuntu mirror URL is specified by setting the 'UBUNTU_MIRROR' environment
 variable.