diff --git a/docs/hardware/index.rst b/docs/hardware/index.rst
index c934e226c0bcd596e013573ff32dc11d9f1f76bd..60489db8d424e8c3af28f23128970b2a8bbd78e4 100644
--- a/docs/hardware/index.rst
+++ b/docs/hardware/index.rst
@@ -1,13 +1,20 @@
 The pyboard hardware
 ====================
 
-* `PYBv1.0 schematics and layout <http://micropython.org/static/doc/PYBv10b.pdf>`_ (2.4MiB PDF)
-* `PYBv1.0 metric dimensions <http://micropython.org/static/doc/PYBv10b-metric-dimensions.pdf>`_ (360KiB PDF)
-* `PYBv1.0 imperial dimensions <http://micropython.org/static/doc/PYBv10b-imperial-dimensions.pdf>`_ (360KiB PDF)
+* `PYBv1.0 schematics and layout <http://micropython.org/resources/PYBv10b.pdf>`_ (2.4MiB PDF)
+* `PYBv1.0 metric dimensions <http://micropython.org/resources/PYBv10b-metric-dimensions.pdf>`_ (360KiB PDF)
+* `PYBv1.0 imperial dimensions <http://micropython.org/resources/PYBv10b-imperial-dimensions.pdf>`_ (360KiB PDF)
 
 Datasheets for the components on the pyboard
 ============================================
 
 * The microcontroller: `STM32F405RGT6 <http://www.st.com/web/catalog/mmc/FM141/SC1169/SS1577/LN1035/PF252144>`_ (link to manufacturer's site)
-* The accelerometer: `Freescale MMA7660 <http://micropython.org/static/doc/MMA7660FC.pdf>`_ (800kiB PDF)
-* The LDO voltage regulator: `Microchip MCP1802 <http://micropython.org/static/doc/MCP1802-22053C.pdf>`_ (400kiB PDF)
+* The accelerometer: `Freescale MMA7660 <http://micropython.org/resources/datasheets/MMA7660FC.pdf>`_ (800kiB PDF)
+* The LDO voltage regulator: `Microchip MCP1802 <http://micropython.org/resources/datasheets/MCP1802-22053C.pdf>`_ (400kiB PDF)
+
+Datasheets for other components
+===============================
+
+* The LCD display on the LCD touch-sensor skin: `Newhaven Display NHD-C12832A1Z-FSW-FBW-3V3 <http://micropython.org/resources/datasheets/NHD-C12832A1Z-FSW-FBW-3V3.pdf>`_ (460KiB PDF)
+* The touch sensor chip on the LCD touch-sensor skin: `Freescale MPR121 <http://micropython.org/resources/datasheets/MPR121.pdf>`_
+* The digital potentiometer on the audio skin: `Microchip MCP4541 <http://micropython.org/resources/datasheets/MCP4541-22107B.pdf>`_
diff --git a/docs/quickref.rst b/docs/quickref.rst
index f02531243586674dcad8c4e9f879a4e7943e6523..1aaddadc00cc86a87949a8c15d9f26a7614341d2 100644
--- a/docs/quickref.rst
+++ b/docs/quickref.rst
@@ -3,8 +3,8 @@
 Quick reference for the pyboard
 ===============================
 
-.. image:: http://micropython.org/static/resources/pybv10-pinout.jpg
-    :alt: AMP skin
+.. image:: http://micropython.org/resources/pybv10-pinout.jpg
+    :alt: PYBv1.0 pinout
     :width: 700px
 
 General board control
diff --git a/docs/topindex.html b/docs/topindex.html
index 1ffffa586d9525f0221b46365fb81332d62f0258..f0588c46a2bdba73f29df727018f87deb2434495 100644
--- a/docs/topindex.html
+++ b/docs/topindex.html
@@ -27,7 +27,7 @@
         <span class="linkdescr">schematics, dimensions and component datasheets</span>
       </p>
       <p class="biglink">
-        <a class="biglink" href="http://micropython.org/static/doc/Micro-Python-Windows-setup.pdf">Guide for pyboard on Windows (PDF)</a><br/>
+        <a class="biglink" href="http://micropython.org/resources/Micro-Python-Windows-setup.pdf">Guide for pyboard on Windows (PDF)</a><br/>
         <span class="linkdescr">including DFU programming</span>
       </p>
       <p class="biglink">
diff --git a/docs/tutorial/amp_skin.rst b/docs/tutorial/amp_skin.rst
index fbf0bde2d38a5749791d71ee23407d191d50ebbb..dd949e180f7edd6762d8c6913604496cc623cce1 100644
--- a/docs/tutorial/amp_skin.rst
+++ b/docs/tutorial/amp_skin.rst
@@ -3,11 +3,11 @@ The AMP audio skin
 
 Soldering and using the AMP audio skin.
 
-.. image:: http://micropython.org/static/doc/skin-amp-1.jpg
+.. image:: img/skin_amp_1.jpg
     :alt: AMP skin
     :width: 250px
 
-.. image:: http://micropython.org/static/doc/skin-amp-3.jpg
+.. image:: img/skin_amp_2.jpg
     :alt: AMP skin
     :width: 250px
 
@@ -51,11 +51,11 @@ For example::
     dac.write_timed(buf, 400 * len(buf), mode=DAC.CIRCULAR)
 
 You can also play WAV files using the Python ``wave`` module.  You can get
-the wave module `here <http://micropython.org/static/doc/examples/wave.py>`_ and you will also need
-the chunk module available `here <http://micropython.org/static/doc/examples/chunk.py>`_.  Put these
+the wave module `here <http://micropython.org/resources/examples/wave.py>`_ and you will also need
+the chunk module available `here <http://micropython.org/resources/examples/chunk.py>`_.  Put these
 on your pyboard (either on the flash or the SD card in the top-level
 directory).  You will need an 8-bit WAV file to play, such as
-`this one <http://micropython.org/static/doc/examples/test.wav>`_.  Then you can do::
+`this one <http://micropython.org/resources/examples/test.wav>`_.  Then you can do::
 
     >>> import wave
     >>> from pyb import DAC
diff --git a/docs/tutorial/img/skin_amp_1.jpg b/docs/tutorial/img/skin_amp_1.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..df4446008032fa479bb3fa9e915a017571ed5176
Binary files /dev/null and b/docs/tutorial/img/skin_amp_1.jpg differ
diff --git a/docs/tutorial/img/skin_amp_2.jpg b/docs/tutorial/img/skin_amp_2.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..7631b3b6334dd3d82d64b79ec98e6fffc6f503d8
Binary files /dev/null and b/docs/tutorial/img/skin_amp_2.jpg differ
diff --git a/docs/tutorial/img/skin_lcd_1.jpg b/docs/tutorial/img/skin_lcd_1.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..1dda73ffd53679bd7323906cd92569bdaf7c17a9
Binary files /dev/null and b/docs/tutorial/img/skin_lcd_1.jpg differ
diff --git a/docs/tutorial/img/skin_lcd_2.jpg b/docs/tutorial/img/skin_lcd_2.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..6e3e1033efce6149d14f6d3a45dfe7c2f25f0ae1
Binary files /dev/null and b/docs/tutorial/img/skin_lcd_2.jpg differ
diff --git a/docs/tutorial/lcd_skin.rst b/docs/tutorial/lcd_skin.rst
index 288b63162ab1052e38f24a693ac6bc6b2c1c7d76..8f981de635e01a31a57b10fb32546fdf7f0fcea6 100644
--- a/docs/tutorial/lcd_skin.rst
+++ b/docs/tutorial/lcd_skin.rst
@@ -3,11 +3,11 @@ The LCD and touch-sensor skin
 
 Soldering and using the LCD and touch-sensor skin.
 
-.. image:: http://micropython.org/static/doc/skin-lcd-3.jpg
+.. image:: img/skin_lcd_1.jpg
     :alt: pyboard with LCD skin
     :width: 250px
 
-.. image:: http://micropython.org/static/doc/skin-lcd-1.jpg
+.. image:: img/skin_lcd_2.jpg
     :alt: pyboard with LCD skin
     :width: 250px
 
@@ -58,7 +58,7 @@ enables the 4 touch sensors.  The third line reads the touch
 status and the ``touch`` variable holds the state of the 4 touch
 buttons (A, B, X, Y).
 
-There is a simple driver `here <http://micropython.org/static/doc/examples/mpr121.py>`_
+There is a simple driver `here <http://micropython.org/resources/examples/mpr121.py>`_
 which allows you to set the threshold and debounce parameters, and
 easily read the touch status and electrode voltage levels.  Copy
 this script to your pyboard (either flash or SD card, in the top
@@ -81,4 +81,4 @@ initialise the I2C bus using::
     >>> m = mpr121.MPR121(pyb.I2C(2, pyb.I2C.MASTER))
 
 There is also a demo which uses the LCD and the touch sensors together,
-and can be found `here <http://micropython.org/static/doc/examples/lcddemo.py>`_.
+and can be found `here <http://micropython.org/resources/examples/lcddemo.py>`_.
diff --git a/docs/tutorial/script.rst b/docs/tutorial/script.rst
index d1b12ae6d1d629eb04df3a1e5644f0ed31d5068a..011484722c2ceaaeeb27212c0357207600c17eae 100644
--- a/docs/tutorial/script.rst
+++ b/docs/tutorial/script.rst
@@ -46,16 +46,16 @@ a window (or command line) should be showing the files on the pyboard drive.
 The drive you are looking at is known as ``/flash`` by the pyboard, and should contain
 the following 4 files:
 
-* `boot.py <http://micropython.org/static/doc/fresh-pyboard/boot.py>`_ -- this script is executed when the pyboard boots up.  It sets
+* `boot.py <http://micropython.org/resources/fresh-pyboard/boot.py>`_ -- this script is executed when the pyboard boots up.  It sets
     up various configuration options for the pyboard.
 
-* `main.py <http://micropython.org/static/doc/fresh-pyboard/main.py>`_ -- this is the main script that will contain your Python program.
+* `main.py <http://micropython.org/resources/fresh-pyboard/main.py>`_ -- this is the main script that will contain your Python program.
     It is executed after ``boot.py``.
 
-* `README.txt <http://micropython.org/static/doc/fresh-pyboard/README.txt>`_ -- this contains some very basic information about getting
+* `README.txt <http://micropython.org/resources/fresh-pyboard/README.txt>`_ -- this contains some very basic information about getting
     started with the pyboard.
 
-* `pybcdc.inf <http://micropython.org/static/doc/fresh-pyboard/pybcdc.inf>`_ -- this is a Windows driver file to configure the serial USB
+* `pybcdc.inf <http://micropython.org/resources/fresh-pyboard/pybcdc.inf>`_ -- this is a Windows driver file to configure the serial USB
     device.  More about this in the next tutorial.
 
 Editing ``main.py``