diff --git a/README.md b/README.md
index cfa5708..b28d8b4 100644
--- a/README.md
+++ b/README.md
@@ -125,7 +125,7 @@
 ###// Useful scripts and snippets
 [[back to top](#a-collection-of-useful-scripts-tutorials-and-other-python-related-things)]
 
-- [IPython magic function %watermark](http://nbviewer.ipython.org/github/rasbt/python_reference/blob/master/ipython_magic/watermark.ipynb) - for printing date- and time-stamps and various system info
+- [watermark](https://github.com/rasbt/watermark) - An IPython magic extension for printing date and time stamps, version numbers, and hardware information.
 
 - [Shell script](./useful_scripts/prepend_python_shebang.sh) for prepending Python-shebangs to .py files.
 
diff --git a/ipython_magic/README.md b/ipython_magic/README.md
new file mode 100644
index 0000000..fb167a8
--- /dev/null
+++ b/ipython_magic/README.md
@@ -0,0 +1,8 @@
+watermark
+=========
+
+An IPython magic extension for printing date and time stamps, version numbers, and hardware information
+
+![](./images/watermark_ex1.png)
+
+**watermark is now located and maintained in a separate GitHub repository:** [https://github.com/rasbt/watermark](https://github.com/rasbt/watermark)
\ No newline at end of file
diff --git a/ipython_magic/images/watermark_ex1.png b/ipython_magic/images/watermark_ex1.png
new file mode 100644
index 0000000..6e95b03
Binary files /dev/null and b/ipython_magic/images/watermark_ex1.png differ
diff --git a/ipython_magic/watermark.ipynb b/ipython_magic/watermark.ipynb
index 3c2433e..d88d6b8 100644
--- a/ipython_magic/watermark.ipynb
+++ b/ipython_magic/watermark.ipynb
@@ -1,7 +1,7 @@
 {
  "metadata": {
   "name": "",
-  "signature": "sha256:ae521d31a2ed8eb2f249825915f64611628365cb0ced53ef18be691238c0018e"
+  "signature": "sha256:968e6f47972d4ab9e2ef4eef6906343257267ccf094fcae08da24fec3647743d"
  },
  "nbformat": 3,
  "nbformat_minor": 0,
@@ -23,6 +23,13 @@
       "<hr>"
      ]
     },
+    {
+     "cell_type": "markdown",
+     "metadata": {},
+     "source": [
+      "<font color=\"red\">**watermark is now located and maintained in a separate GitHub repository:** [https://github.com/rasbt/watermark](https://github.com/rasbt/watermark)<font>"
+     ]
+    },
     {
      "cell_type": "heading",
      "level": 1,