diff --git a/docs/CompilerWriterInfo.html b/docs/CompilerWriterInfo.html
deleted file mode 100644
index 66190655fa5..00000000000
--- a/docs/CompilerWriterInfo.html
+++ /dev/null
@@ -1,267 +0,0 @@
-
-
-
-
- Architecture/platform information for compiler writers
-
-
-
-
-
-
- Architecture/platform information for compiler writers
-
-
-
-
Note: This document is a work-in-progress. Additions and clarifications
- are welcome.
-
-
-
- - Hardware
-
- - ARM
- - Itanium
- - MIPS
- - PowerPC
- - SPARC
- - X86
- - Other lists
-
- - Application Binary Interface (ABI)
-
- - Linux
- - OS X
-
- - Miscellaneous resources
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
IBM - Official manuals and docs
-
-
-
-
-
Other documents, collections, notes
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
AMD - Official manuals and docs
-
-
-
-
-
Intel - Official manuals and docs
-
-
-
-
-
Other x86-specific information
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Misha Brukman
- LLVM Compiler Infrastructure
- Last modified: $Date$
-
-
-
-
diff --git a/docs/CompilerWriterInfo.rst b/docs/CompilerWriterInfo.rst
new file mode 100644
index 00000000000..e41f5f9eece
--- /dev/null
+++ b/docs/CompilerWriterInfo.rst
@@ -0,0 +1,118 @@
+.. _compiler_writer_info:
+
+========================================================
+Architecture & Platform Information for Compiler Writers
+========================================================
+
+.. contents::
+ :local:
+
+.. note::
+
+ This document is a work-in-progress. Additions and clarifications are
+ welcome.
+
+ Compiled by `Misha Brukman `_.
+
+Hardware
+========
+
+ARM
+---
+
+* `ARM documentation `_ (`Processor Cores `_ Cores)
+
+* `ABI `_
+
+Itanium (ia64)
+--------------
+
+* `Itanium documentation `_
+
+MIPS
+----
+
+* `MIPS Processor Architecture `_
+
+PowerPC
+-------
+
+IBM - Official manuals and docs
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+* `PowerPC Architecture Book `_
+
+ * Book I: `PowerPC User Instruction Set Architecture `_
+
+ * Book II: `PowerPC Virtual Environment Architecture `_
+
+ * Book III: `PowerPC Operating Environment Architecture `_
+
+* `PowerPC Compiler Writer's Guide `_
+
+* `PowerPC Processor Manuals `_
+
+* `Intro to PowerPC Architecture `_
+
+* `IBM AIX/5L for POWER Assembly Reference `_
+
+Other documents, collections, notes
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+* `PowerPC ABI documents `_
+* `PowerPC64 alignment of long doubles (from GCC) `_
+* `Long branch stubs for powerpc64-linux (from binutils) `_
+
+SPARC
+-----
+
+* `SPARC resources `_
+* `SPARC standards `_
+
+X86
+---
+
+AMD - Official manuals and docs
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+* `AMD processor manuals `_
+* `X86-64 ABI `_
+
+Intel - Official manuals and docs
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+* `IA-32 manuals `_
+* `Intel Itanium documentation `_
+
+Other x86-specific information
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+* `Calling conventions for different C++ compilers and operating systems `_
+
+Other relevant lists
+--------------------
+
+* `GCC reading list `_
+
+ABI
+===
+
+Linux
+-----
+
+* `PowerPC 64-bit ELF ABI Supplement `_
+
+OS X
+----
+
+* `Mach-O Runtime Architecture `_
+* `Notes on Mach-O ABI `_
+
+Miscellaneous Resources
+=======================
+
+* `Executable File Format library `_
+
+* `GCC prefetch project `_ page has a
+ good survey of the prefetching capabilities of a variety of modern
+ processors.
diff --git a/docs/programming.rst b/docs/programming.rst
index fe2604fbb7b..e8acc1d2e0c 100644
--- a/docs/programming.rst
+++ b/docs/programming.rst
@@ -8,6 +8,7 @@ Programming Documentation
CodingStandards
CommandLine
+ CompilerWriterInfo
Atomics
HowToSetUpLLVMStyleRTTI
@@ -49,3 +50,7 @@ Programming Documentation
(`tarball `_)
* `ViewVC Repository Browser `_
+
+* :ref:`compiler_writer_info`
+
+ A list of helpful links for compiler writers.