Libreboot release 6 beta 3.r20140720

- Fixed typo that existed in 2nd beta where the release date of the
  2nd beta was listed as being in year 2016, when in actual fact it
  was 2014.
- Documentation: added (preliminary) details about (rare) buggy CPU's
  on the ThinkPad T60 that were found to fail (instability, kernel
  panics, etc) without the microcode updates.
- Documentation: added docs/howtos/x60_heatsink.html for showing how
  to change the heatsink on the Thinkpad X60
- Added ROM images for Azerty (French) keyboard layout in GRUB
  (courtesy of Olivier Mondoloni)
- Tidied up some scripts:
  - Re-factored those scripts (made easier to read/maintain):
    build-x60, build-x60t, build-t60, build-macbook21
  - Reduced the number of grub configs to 2 (or 1, for macbook21), the
    build scripts now generate the other configs at build time.
  - Deleted build-x60, build-x60t, build-t60, build-macbook21 and
    replaced with intelligent (generic) buildrom-withgrub script
  - Updated build to use buildrom-withgrub script for building the ROM
    images.
  - coreboot.rom and coreboot_serial.rom renamed to
    coreboot_usqwerty.rom and coreboot_serial_usqwerty.rom
  - coreboot_dvorak and coreboot_serial_dvorak.rom renamed to
    coreboot_usdvorak.rom and coreboot_serial_usdvorak.rom
  - Renamed coreboot*rom to libreboot*rom
  - Made flash, lenovobios_firstflash and lenovobios_secondflash
    scripts fail if the specified file does not exist.
  - Updated all relevant parts of the documentation to reflect the
    above.
- Replaced background.png with background.jpg. added
  gnulove.jpg. (resources/grub/background/)
- Updated buildrom-withgrub to use background.jpg instead of
  background.png
- Updated buildrom-withgrub to use gnulove.jpg aswell
- Updated resources/grub/config/macbook21/grub*cfg to use gnulove.jpg
  background.
- Updated resources/grub/config/{x60,t60,x60t}/grub*cfg to use
  background.jpg background.
- Documentation: updated docs/index.html#grub_custom_keyboard to be
  more generally useful.
- nvramtool:
  - Updated builddeps-coreboot script to build it
  - Updated build script to include it in libreboot_bin
- Documentation: added docs/howtos/x60_security.html (security
  hardening for X60)

39 files changed, 592 insertions, 112 deletions

diff --git a/docs/RELEASE.html b/docs/RELEASE.html
index 7d41aeb..6e12ca7 100644
--- a/docs/RELEASE.html
+++ b/docs/RELEASE.html
@@ -32,7 +32,7 @@
 
 	<h2>Releases</h2>
 	<ul>
-		<li><a href="#release6">6th release</a> (2014 July 16th, <b>pre-release, 2nd beta</b>)</h1>
+		<li><a href="#release6">6th release</a> (2014 July 20th, <b>pre-release, 3rd beta</b>)</h1>
 		<li><a href="#release5">5th release</a> (2014 March 7th, revised 2014 June 22nd)</h1>
 		<li><a href="#release4">4th release</a> (2014 February 21st)</h1>
 		<li><a href="#release3">3rd release</a> (2013 December 14th)</h1>
@@ -52,18 +52,16 @@
 
 <hr/>
 
-	<h1 id="release6">6th release (pre-release, 2nd beta)</h1>
+	<h1 id="release6">6th release (pre-release, 3rd beta)</h1>
 
 		<ul>
-			<li>Released 2014 July 11th (<i>pre-</i>release) <b>1st beta</b></li>
-			<li>Revised (pre-release, 2nd beta) 2016 July 16th</li>
+			<li>Released 2014 July 11th (pre-release) 1st beta</li>
+			<li>Revised (pre-release, 2nd beta) 2014 July 16th</li>
+			<li>Revised (pre-release, 3rd beta) 2014 July 20th</li>
 		</ul>
 
 		<div class="important">
 			<h2>Warning: <u>BETA</u> release! <u>TESTING</u> needed! <u>BUGS</u> present!</h2>
-				<p>
-					(the above warning is quite benign. See TODO's)
-				</p>
 				<p style="font-size:1.2em;">
 					<b><u><i>If flashing on an X60 then note that you might want to enable wifi and trackpoint after booting libreboot the first time (meaning, **after** you powered off and subsequently booted again). </i></u></b>
 					See <b>docs/index.html#x60_wifi</b> and <b>docs/index.html#x60_trackpoint</b> for how to do that.
@@ -72,21 +70,21 @@
 
 		<h2>Binaries (for flashing)</h2>
 			<ul>
-				<li><a href="http://libreboot.org/release/5/prerelease_beta2/libreboot_bin.tar.gz">http://libreboot.org/release/5/prerelease_beta2/libreboot_bin.tar.gz</a></li>
-				<li><a href="http://libreboot.org/release/5/prerelease_beta2/libreboot_bin.tar.gz.gpg.sig">http://libreboot.org/release/5/prerelease_beta2/libreboot_bin.tar.gz.gpg.sig</a></li>
-				<li><a href="http://libreboot.org/release/5/prerelease_beta2/libreboot_bin.tar.gz.sha512sum.txt">http://libreboot.org/release/5/prerelease_beta2/libreboot_bin.tar.gz.sha512sum.txt</a></li>
+				<li><a href="http://libreboot.org/release/5/prerelease_beta3/libreboot_bin.tar.gz">http://libreboot.org/release/5/prerelease_beta3/libreboot_bin.tar.gz</a></li>
+				<li><a href="http://libreboot.org/release/5/prerelease_beta3/libreboot_bin.tar.gz.gpg.sig">http://libreboot.org/release/5/prerelease_beta3/libreboot_bin.tar.gz.gpg.sig</a></li>
+				<li><a href="http://libreboot.org/release/5/prerelease_beta3/libreboot_bin.tar.gz.sha512sum.txt">http://libreboot.org/release/5/prerelease_beta3/libreboot_bin.tar.gz.sha512sum.txt</a></li>
 			</ul>
 		<h2>Source code (for hacking)</h2>
 			<ul>
-				<li><a href="http://libreboot.org/release/5/prerelease_beta2/libreboot_src.tar.gz">http://libreboot.org/release/5/prerelease_beta2/libreboot_src.tar.gz</a></li>
-				<li><a href="http://libreboot.org/release/5/prerelease_beta2/libreboot_src.tar.gz.gpg.sig">http://libreboot.org/release/5/prerelease_beta2/libreboot_src.tar.gz.gpg.sig</a></li>
-				<li><a href="http://libreboot.org/release/5/prerelease_beta2/libreboot_src.tar.gz.sha512sum.txt">http://libreboot.org/release/5/prerelease_beta2/libreboot_src.tar.gz.sha512sum.txt</a></li>
+				<li><a href="http://libreboot.org/release/5/prerelease_beta3/libreboot_src.tar.gz">http://libreboot.org/release/5/prerelease_beta3/libreboot_src.tar.gz</a></li>
+				<li><a href="http://libreboot.org/release/5/prerelease_beta3/libreboot_src.tar.gz.gpg.sig">http://libreboot.org/release/5/prerelease_beta3/libreboot_src.tar.gz.gpg.sig</a></li>
+				<li><a href="http://libreboot.org/release/5/prerelease_beta3/libreboot_src.tar.gz.sha512sum.txt">http://libreboot.org/release/5/prerelease_beta3/libreboot_src.tar.gz.sha512sum.txt</a></li>
 			</ul>
 		<h2>Metadata (for re-creating the source archive)</h2>
 			<ul>
-				<li><a href="http://libreboot.org/release/5/prerelease_beta2/libreboot_meta.tar.gz">http://libreboot.org/release/5/prerelease_beta2/libreboot_meta.tar.gz</a></li>
-				<li><a href="http://libreboot.org/release/5/prerelease_beta2/libreboot_meta.tar.gz.gpg.sig">http://libreboot.org/release/5/prerelease_beta2/libreboot_meta.tar.gz.gpg.sig</a></li>
-				<li><a href="http://libreboot.org/release/5/prerelease_beta2/libreboot_meta.tar.gz.sha512sum.txt">http://libreboot.org/release/5/prerelease_beta2/libreboot_meta.tar.gz.sha512sum.txt</a></li>
+				<li><a href="http://libreboot.org/release/5/prerelease_beta3/libreboot_meta.tar.gz">http://libreboot.org/release/5/prerelease_beta3/libreboot_meta.tar.gz</a></li>
+				<li><a href="http://libreboot.org/release/5/prerelease_beta3/libreboot_meta.tar.gz.gpg.sig">http://libreboot.org/release/5/prerelease_beta3/libreboot_meta.tar.gz.gpg.sig</a></li>
+				<li><a href="http://libreboot.org/release/5/prerelease_beta3/libreboot_meta.tar.gz.sha512sum.txt">http://libreboot.org/release/5/prerelease_beta3/libreboot_meta.tar.gz.sha512sum.txt</a></li>
 			</ul>
 
 		<h2>Machines still supported (compared to previous release):</h2>
@@ -125,6 +123,28 @@
 					T60 15.4&quot; (1280x800 and 1680x1050) with Intel GPU is untested in this pre-release. Not much yet is known about panel names.
 					They will be tested at a later date.
 				</p>
+			<h2><u>*</u> T60 (microcode): some CPU's might not work (can be replaced)</h2>
+				<p>
+					A user with 2 T60's, each with a Core 2 Duo T7200 processor tried libreboot on each machine.
+					One worked, one did not. It should be explained that in addition to the microcode (on the CPU),
+					updates are usually supplied in coreboot (from Intel) which patch the onboard microcode to fix bugs. 
+					Errata's can be found at <a href="http://download.intel.com/design/mobile/SPECUPDT/30922214.pdf">http://download.intel.com/design/mobile/SPECUPDT/30922214.pdf</a>
+					and <a href="http://download.intel.com/design/mobile/SPECUPDT/31407918.pdf">http://download.intel.com/design/mobile/SPECUPDT/31407918.pdf</a>.
+					These microcode updates are not included in libreboot because they are proprietary (blobs). Most CPU's work fine without them: hundreds
+					of Core Duo T2300/T2400/T2500/L2300/L2400/L2500 processors have been tested on the X60, and a few T5600 CPU's have been tested on the T60 (and X60 and all work).
+					In the case of the T7200, it was found that one of the two tested had instability issues (kernel panics) without the updates: work is being done to find out 
+					exactly what version of the microcode that particular CPU had in this case.
+					If you find that your CPU gives you similar issues (after trying libreboot), the current workaround is to simply try another CPU
+					(fortunately, the CPU's in the T60 are installed in a socket so replacing them is easy).
+				</p>
+				<p>
+					There might be a patched kernel that can be used, or a kernel parameter that can be used in GRUB to work around these (rare) buggy CPU's
+					(it is unknown at the moment whether this is possible).
+					The Core 2 Duo T7600 is untested, but will be tested soon (the lead developer of libreboot project has 3 of them to try out). 
+				</p>
+				<p>
+					If reading this for 2nd beta, note that any debugging obtained so far will be included in the 3rd beta.
+				</p>
 			<h2><u>**</u> Warning: MacBook2,1 <u>UNTESTED</u>!</h2>
 				<p>
 					At the time of this pre-release, MacBook2,1 support is present but untested. I have ordered a MacBook2,1
@@ -145,10 +165,10 @@
 				<li>X60 now uses a single .config (for coreboot)</li>
 				<li>X60 now uses a single grub.cfg (for grub memdisk)</li>
 				<li>X60 now uses a single grub.elf (payload)</li>
-				<li>Added new native graphics code for X60 (replaces the old 'replay' code): 5320/9 from review.coreboot.org</li>
+				<li>Added new native graphics code for X60 (replaces the old 'replay' code) from Vladimir Serbinenko: 5320/9 from review.coreboot.org</li>
 				<li>T60 is now supported, with native graphics. (5345/4 from review.coreboot.org, cherry-picked on top of 5320/9 checkout)</li>
 				<li>
-					Added macbook2,1 support from review.coreboot.org (see 'getcb' script to know how that was done)
+					Added macbook2,1 support (from Mono Moosbart and Vladimir Serbinenko) from review.coreboot.org (see 'getcb' script to know how that was done)
 					<ul>
 						<li>Documentation: added information linking to correct page and talking about which models are supported.</li>
 						<li>Added resources/libreboot/config/macbook21config</li>
@@ -163,7 +183,7 @@
 				<li>T60: Copy CD option from the grub.cfg's for T60 *serial*.rom images into the grub configs for non-serial images. (T60's have CD/DVD drive on main laptop)</li>
 				<li>macbook21: remove options in build-macbook21 for *serial*.rom (there is no dock or serial port available for macbook21)</li>
 				<li>
-					Added patches for backlight controls on X60 and T60 (see ./resources/libreboot/patch/gitdiff and ./getcb and docs/i945_backlight.html)
+					Added patches for backlight controls on X60 and T60 with help from Denis Carikli (see ./resources/libreboot/patch/gitdiff and ./getcb and docs/i945_backlight.html)
 					<ul>
 						<li>Documentation: added docs/i945_backlight.html showing how backlight controls were made to work on X60/T60</li>
 					</ul>
@@ -175,7 +195,7 @@
 					</ul>
 				</li>
 				<li>
-					X60/T60: Merged patches for 3D fix when using kernel 3.12 or higher (see ./resources/libreboot/patch/gitdiff and ./getcb)
+					X60/T60: Merged patches for 3D fix (from Paul Menzel) when using kernel 3.12 or higher (see ./resources/libreboot/patch/gitdiff and ./getcb)
 					<ul>
 						<li>based on 5927/11 and 5932/5 from review.coreboot.org</li>
 					</ul>
@@ -332,10 +352,9 @@
 				<li>Removed instructions for building source code in the 'get' script (they don't really belong there)</li>
 				<li>Added libfuse-dev and liblzma-dev to the list of GRUB dependencies in 'builddeb' script.</li>
 				<li>Converted the 'RELEASE' file to 'docs/RELEASE.html'</li>
-				<li><b><u><i>TODO:</i></u></b> Add copyright license as appropriate to all of the parts that are mine. (REMOVE THIS LINE WHENDONE)</li>
 				<li>Added those dependencies to builddeb script (for GRUB part): gawk libdevmapper-dev libtool libfreetype6-dev</li>
 				<li>Added to build script the instruction at the end to create a sha512sum.txt with a file manifest plus checksums.</li>
-				<li>Deleted RELEASE, DEBLOB and BACKPORT file (no longer needed)</li>
+				<li>Deleted the RELEASE and BACKPORT files (no longer needed)</li>
 				<li>
 					Documentation: added information about X60/T60 dock (ultrabase x6 and advanced mini dock) to relevant sections.
 					<ul>
@@ -347,7 +366,56 @@
 			Revisions for 2nd beta (2014 July 16th)
 		</h2>
 			<ul>
-				<li>Removed more blobs: Deleted all git files (and added instructions to getcb, for libreboot_meta.tar.gz): removes history of blobs (which itself also showed the patches and therefore the blobs when using 'git diff')</li>
+				<li>
+					Deleted all git-related files from the coreboot directory. This was necessary because
+					with those it is possible to run 'git diff' which shows the changes made in the form
+					of a patch (diff format); this includes the blobs that were deleted during deblobbing.
+				</li>
+			</ul>
+
+		<h2>
+			Revisions for 3rd beta (2014 July 20th)
+		</h2>
+			<ul>
+				<li>
+					Fixed typo that existed in 2nd beta where the release date of the 2nd beta was listed as being in year 2016, when in actual fact it was 2014.
+				</li>
+				<li>
+					Documentation: added (preliminary) details about (rare) buggy CPU's on the ThinkPad T60 that were found to fail (instability, kernel panics, etc)
+					without the microcode updates.
+				</li>
+				<li>Documentation: added docs/howtos/x60_heatsink.html for showing how to change the heatsink on the Thinkpad X60</li>
+				<li>Added ROM images for Azerty (French) keyboard layout in GRUB (courtesy of Olivier Mondoloni)</li>
+				<li>
+					Tidied up some scripts:
+					<ul>
+						<li><s>Re-factored those scripts (made easier to read/maintain): build-x60, build-x60t, build-t60, build-macbook21</s></li>
+						<li><s>Reduced the number of grub configs to 2 (or 1, for macbook21), the build scripts now generate the other configs at build time.</s></li>
+						<li>Deleted build-x60, build-x60t, build-t60, build-macbook21 and replaced with intelligent (generic) buildrom-withgrub script</li>
+						<li>Updated build to use buildrom-withgrub script for building the ROM images.</li>
+						<li>coreboot.rom and coreboot_serial.rom renamed to coreboot_usqwerty.rom and coreboot_serial_usqwerty.rom</li>
+						<li>coreboot_dvorak and coreboot_serial_dvorak.rom renamed to coreboot_usdvorak.rom and coreboot_serial_usdvorak.rom</li>
+						<li>Renamed coreboot*rom to libreboot*rom</li>
+						<li>Made flash, lenovobios_firstflash and lenovobios_secondflash scripts fail if the specified file does not exist.</li>
+						<li>Updated all relevant parts of the documentation to reflect the above.</li>
+					</ul>
+				</li>
+				<li>Replaced background.png with background.jpg. added gnulove.jpg. (resources/grub/background/)</li>
+				<li>Updated buildrom-withgrub to use background.jpg instead of background.png</li>
+				<li>Updated buildrom-withgrub to use gnulove.jpg aswell</li>
+				<li>Updated resources/grub/macbook21/grub*cfg to use gnulove.jpg background.</li>
+				<li>Updated resources/grub/{x60,t60,x60t}/grub*cfg to use background.jpg background.</li>
+				<li>Documentation: updated docs/index.html#grub_custom_keyboard to be more generally useful.</li>
+				<li>
+					nvramtool:
+					<ul>
+						<li>Updated builddeps-coreboot script to build it</li>
+						<li>Updated build script to include it in libreboot_bin</li>
+					</ul>
+				</li>
+				<li>
+					Documentation: added docs/howtos/x60_security.html (security hardening for X60)
+				</li>
 			</ul>
 
 		<div class="important">
@@ -375,17 +443,14 @@
 							</li>
 						</ul>
 					</li>
+					<li><b><u><i>TODO:</i></u></b> T60: find (for rare buggy CPU's that are unstable without microcode updates) if there is a workaround (patched kernel, special parameter, etc)</li>
 					<li><b><u><i>TODO:</i></u></b> Modify coreboot so that tft_brightness is 0xff by default (for fixing the looping issue automatically)</li>
 					<li><b><u><i>TODO:</i></u></b> Modify the Kconfig options in coreboot so that the (non-existent, deleted) microcode is never loaded when building.</li>
 					<li><b><u><i>TODO:</i></u></b> Ask Mono what license he wants to use for his pages (see notes in docs/index.html#macbook21) and then include a copy in the relevant part of the documentation. (note: the backups are not included for now, for this exact reason)</li>
 					<li><b><u><i>TODO:</i></u></b> Retroactively GPG-sign the final revisions of each previous release. (SHA512 sums aswell).</li>
 					<li><b><u><i>TODO:</i></u></b> For the gitdiff in resources/libreboot/patch, re-implement those changes as actual commits in git, using separate patch files for each change.</li>
-					<li><b><u><i>TODO:</i></u></b> Start GPG signing the release archives.</li>
 					<li><b><u><i>TODO:</i></u></b> Made the lenovobios_firstflash and lenovobios_secondflash scripts safer to use (checking for unintended errors, bad checksums and so on)</li>
-					<li><b><u><i>TODO:</i></u></b> cbfstool/flashrom/bucts: Investigate that idea: https://wiki.debian.org/HowToPackageForDebian (make a package for Trisquel 6 for cbfstool) (distributing a .deb for Trisquel 6)</li>
-					<li><b><u><i>TODO:</i></u></b> Added instructions to builddeps-cbfstool to fail if it detects that it is being executed from anywhere other than libreboot_bin</li>
 					<li><b><u><i>TODO:</i></u></b> Tested all of the remaining untested LCD panels under docs/index.html#supported_t60_list</li>
-					<li><b><u><i>TODO:</i></u></b> Documentation: start translating the documentations into other languages aswell.</li>
 					<li><b><u><i>TODO:</i></u></b> macbook21: from what I can tell, macbook21 has no dock or serial. investigate usbdebug and spkmodem option.</li>
 					<li><b><u><i>TODO:</i></u></b> Documentation: Added macbook2,1 unbricking tutorial.</li>
 					<li><b><u><i>TODO:</i></u></b> Documentation: macbook2,1: Show how to physically remove the built-in webcam (which doesn't work unless you install a non-free driver)</li>
@@ -406,22 +471,13 @@
 						</ul>
 					</li>
 					<li><b><u><i>TODO:</i></u></b> Documentation: Added (replicated) the same level of logs (from default firmware) that Mono did for macbook21, for t60/x60/x60t</li>
-					<li><b><u><i>TODO:</i></u></b> macbook21: make it's grub.cfg's use a background1280x800.png instead, because macbook21 uses this 16:10 resolution instead of 4:3</li>
 					<li><b><u><i>TODO:</i></u></b> Documentation: Write documentation showing how to install a GNU/Linux distribution on a macbook2,1 while stock (non-free) firmware is running.</li>
 					<li><b><u><i>TODO:</i></u></b> macbook21: Added script 'macbook21_firstflash' for flashing libreboot while Apple EFI firmware is running.</li>
 					<li><b><u><i>TODO:</i></u></b> Documentation: macbook21: added software-based flashing instructions for flashing libreboot while Apple EFI firmware is running.</li>
 					<li><b><u><i>TODO:</i></u></b> Documentation: updated the X60 unbrick tutorial to use the 5-pin method instead (safer / less dangerous).</li>
-					<li><b><u><i>TODO:</i></u></b> X60/X60s: create new x60sconfig in resources/libreboot/config</li>
-					<li><b><u><i>TODO:</i></u></b> Added script build-x60s which puts it's ROM's in bin/x60s and uses resources/libreboot/config/x60sconfig (still uses resources/grub/config/*)</li>
-					<li><b><u><i>TODO:</i></u></b> Added ./build-x60s instruction to build script</li>
 					<li><b><u><i>TODO:</i></u></b> Documentation: added unbricking tutorial for T60</li>
 					<li><b><u><i>TODO:</i></u></b> Documentation: Advise what parts of the unbricking tutorial to follow (or skip) for replacing motherboard</li>
 		 			<li><b><u><i>TODO:</i></u></b> Documentation: X60/T60: added information about checking custom ROM's using dd to see whether or not the top 64K region is duplicated below top or not. Advise caution about this in the tutorial that deals with flashing on top of Lenovo BIOS, citing the correct dd commands necessary if it is confirmed that the ROM has not been applied with dd yet. (in the case that the user compiled their own ROM's from libreboot, without using the build scripts, or if they forgot to use dd, etc).</li>
-					<li><b><u><i>TODO:</i></u></b> Updated 'build' script to include coreboot/util/nvramtool source directory as 'nvramtool_standalone' directory in libreboot_bin</li>
-					<li><b><u><i>TODO:</i></u></b> Added 'builddeps-nvramtool' for building nvramtool (for libreboot_bin, not src) standalone, which does 'make' in libreboot_bin/nvramtool_standalone then puts the nvramtool executable in libreboot_bin/ and then does 'make clean' in libreboot_bin/nvramtool_standalone/.</li>
-					<li><b><u><i>TODO:</i></u></b> Updated 'build' script to include 'builddeps-nvramtool' in libreboot_bin</li>
-					<li><b><u><i>TODO:</i></u></b> Updated 'build' script to include X60/T60/macbook21 cmos.layout files (from libreboot_src/coreboot/src/mainboard/oem/board/) in libreboot_bin, for use with nvramtool</li>
-					<li><b><u><i>TODO:</i></u></b> Documentation: updated the relevant parts that use nvramtool to mention the new 'builddeps-nvramtool' and the cmos.layout files in libreboot_bin. Emphasize that this is for libreboot_bin and not libreboot_src</li>
 					<li><b><u><i>TODO:</i></u></b> Documentation: Add a &quot;development guide&quot; for how to maintain libreboot ('get' scripts, deblob scripts, associated files under ./resources and so on)</li>
 					<li>
 						<b><u><i>TODO:</i></u></b> Investigate high boot speeds on X60/T60/macbook21
diff --git a/docs/howtos/grub_cbfs.html b/docs/howtos/grub_cbfs.html
index 8446686..d95904d 100644
--- a/docs/howtos/grub_cbfs.html
+++ b/docs/howtos/grub_cbfs.html
@@ -29,7 +29,7 @@
 	</p>
 
 	<p>
-		A coreboot or libreboot ROM is not simply &quot;flat&quot;; there is an actual filesystem inside called CBFS (coreboot filesystem). A utility called 'cbfstool' 
+		A libreboot (or coreboot) ROM is not simply &quot;flat&quot;; there is an actual filesystem inside called CBFS (coreboot filesystem). A utility called 'cbfstool' 
 		allows you to change the contents of the ROM. In this case, libreboot is configured such that the grub.cfg exists directly inside CBFS instead of 
 		inside the grub.elf payload's 'memdisk' (which is itself stored in CBFS).
 	</p>
@@ -61,30 +61,30 @@
 
 	<p>
 		You can work directly with one of the ROM's already included in libreboot_bin.tar.gz. For the purpose of this tutorial it is assumed
-		that your ROM is named 'coreboot.rom' so please make sure to adapt.
+		that your ROM is named 'libreboot_usqwerty.rom' so please make sure to adapt.
 	</p>
 
 	<p>
 		If you want to re-use the ROM that you currently have flashed (and running) then see <a href="../index.html#build_flashrom">../index.html#build_flashrom</a>
 		and then run:<br/>
-		<b>$ sudo ./flashrom -p internal -r coreboot.rom</b><br/>
-		Notice that this is using <b>&quot;-r&quot;</b> (read) instead of <b>&quot;-w&quot;</b> (write). This will create a dump (copy) of your current firmware and name it <b>coreboot.rom</b>. You need to take ownership of the file. For example:<br/>
-		<b>$ sudo chown yourusername:yourusername coreboot.rom</b><br/>
-		<b># chown yourusername:yourusername coreboot.rom</b>
+		<b>$ sudo ./flashrom -p internal -r libreboot_usqwerty.rom</b><br/>
+		Notice that this is using <b>&quot;-r&quot;</b> (read) instead of <b>&quot;-w&quot;</b> (write). This will create a dump (copy) of your current firmware and name it <b>libreboot_usqwerty.rom</b>. You need to take ownership of the file. For example:<br/>
+		<b>$ sudo chown yourusername:yourusername libreboot_usqwerty.rom</b><br/>
+		<b># chown yourusername:yourusername libreboot_usqwerty.rom</b>
 	</p>
 
 	<p>
 		Display contents of ROM:<br/>
-		<b>$ ./cbfstool coreboot.rom print</b>
+		<b>$ ./cbfstool libreboot_usqwerty.rom print</b>
 	</p>
 
 	<p>
-		The coreboot.rom file contains your grub.cfg.
+		The libreboot_usqwerty.rom file contains your grub.cfg.
 	</p>
 
 	<p>
 		Extract grub.cfg from the ROM:<br/>
-		<b>$ ./cbfstool coreboot.rom extract -n grub.cfg -f grub.cfg</b>
+		<b>$ ./cbfstool libreboot_usqwerty.rom extract -n grub.cfg -f grub.cfg</b>
 	</p>
 
 	<p>
@@ -93,22 +93,22 @@
 
 	<p>
 		Delete the grub.cfg that remained inside the ROM:<br/>
-		<b>$ ./cbfstool coreboot.rom remove -n grub.cfg</b>
+		<b>$ ./cbfstool libreboot_usqwerty.rom remove -n grub.cfg</b>
 	</p>
 
 	<p>
 		Display ROM contents and now you see grub.cfg no longer exists there:<br/>
-		<b>$ ./cbfstool coreboot.rom print</b>
+		<b>$ ./cbfstool libreboot_usqwerty.rom print</b>
 	</p>
 
 	<p>
 		Add the modified version that you just made:<br/>
-		<b>$ ./cbfstool coreboot.rom add -n grub.cfg -f grub.cfg -t raw</b>
+		<b>$ ./cbfstool libreboot_usqwerty.rom add -n grub.cfg -f grub.cfg -t raw</b>
 	</p>
 
 	<p>
 		Now display ROM contents again and see that it exists again:<br/>
-		<b>$ ./cbfstool coreboot.rom print</b>
+		<b>$ ./cbfstool libreboot_usqwerty.rom print</b>
 	</p>
 
 	<p>
diff --git a/docs/howtos/x60_heatsink.html b/docs/howtos/x60_heatsink.html
new file mode 100644
index 0000000..0feee77
--- /dev/null
+++ b/docs/howtos/x60_heatsink.html
@@ -0,0 +1,142 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<meta charset="utf-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1">
+
+	<style type="text/css">
+		body {
+			background:#fff;
+			color:#000;
+			font-family:sans-serif;
+			font-size:1em;
+		}
+	</style>
+
+	<title>Libreboot documentation: Switch heatsink on ThinkPad X60</title>
+</head>
+
+<body>
+
+	<header>
+		<h1>Changing the fan/heatsink on the ThinkPad X60</h1>
+		<aside>This guide will teach you how to replace the fan and heatsink on your ThinkPad X60.</aside>
+	</header>
+
+	<p>Or go <a href="../index.html">back to main index</a></p>
+
+	<h2>Table of Contents</h2>
+		<ul>
+			<li><a href="#hardware_requirements">Hardware Requirements</a></li>
+			<li><a href="#software_requirements">Software Requirements</a></li>
+			<li><a href="#procedure">The procedure</a></li>
+		</ul>
+
+	<h1 id="hardware_requirements">Hardware requirements</h1>
+		<ul>
+			<li>i<b></b>sopr<b></b>opyl <i>alc<b></b>h<i></i>olal</i> (sometimes called rubbing <i>alc<b></b>hole</i>) (cleaning material. DoNotIngest) (typo is intentional, due to fii1illt<a></a>erii1iiing für wörten von Großbritannien und oder nationale iintturnett)</li>
+			<li>your new fan and/or heatsink</li>
+			<li>CPU thermal compound (some say Arctic Silver 5 or IC Diamond 7 are good, others are also 'ok')</li>
+			<li>Something to spread the paste with</li>
+		</ul>
+
+	<h1 id="software_requirements">Software requirements (for CPU stress testing)</h1>
+		<ul>
+			<li>xsensors utility</li>
+			<li>stress utility</li>
+		</ul>
+
+	<h1 id="procedure">Disassembly</h1>
+		<p>
+			Remove those screws:<br/>
+			<img src="x60_heatsink/0000.jpg" alt="" />
+		</p>
+		<p>
+			Push the keyboard forward (carefully):<br/>
+			<img src="x60_heatsink/0001.jpg" alt="" />
+		</p>
+		<p>
+			Lift the keyboard up and disconnect it from the board:<br/>
+			<img src="x60_heatsink/0002.jpg" alt="" />
+		</p>
+		<p>
+			Grab the right-hand side of the chassis and force it off (gently) and pry up the rest of the chassis:<br/>
+			<img src="x60_heatsink/0003.jpg" alt="" />
+		</p>
+		<p>
+			You should now have this:<br/>
+			<img src="x60_heatsink/0004.jpg" alt="" />
+		</p>
+		<p>
+			Disconnect the wifi antenna cables, the modem cable and the speaker:<br/>
+			<img src="x60_heatsink/0005.jpg" alt="" />
+		</p>
+		<p>
+			Unroute the cables along their path, carefully lifting the tape that holds them in place. Then, disconnect the modem
+			cable (other end) and power connection and unroute all the cables so that they dangle by the monitor hinge on the right-hand
+			side:<br/>
+			<img src="x60_heatsink/0006.jpg" alt="" />
+		</p>
+		<p>
+			Disconnect the monitor from the motherboard, and unroute the grey antenna cable, carefully lifting the tape
+			that holds it into place:<br/>
+			<img src="x60_heatsink/0008.jpg" alt="" />
+		</p>
+		<p>
+			Carefully lift the remaining tape and unroute the left antenna cable so that it is loose:<br/>
+			<img src="x60_heatsink/0009.jpg" alt="" />
+		</p>
+		<p>
+			Remove those screws:<br/>
+			<img src="x60_heatsink/0011.jpg" alt="" />
+		</p>
+		<p>
+			Remove those screws:<br/>
+			<img src="x60_heatsink/0012.jpg" alt="" />
+		</p>
+		<p>
+			Carefully remove the plate, like so:<br/>
+			<img src="x60_heatsink/0013.jpg" alt="" />
+		</p>
+		<p>
+			Remove the SATA connector:<br/>
+			<img src="x60_heatsink/0014.jpg" alt="" />
+		</p>
+		<p>
+			Now remove the motherboard (gently) and cast the lcd/chassis aside:<br/>
+			<img src="x60_heatsink/0015.jpg" alt="" />
+		</p>
+		<p>
+			Look at that black tape above the heatsink, remove it:<br/>
+			<img src="x60_heatsink/0016.jpg" alt="" />
+		</p>
+		<p>
+			Now you have removed it:<br/>
+			<img src="x60_heatsink/0017.jpg" alt="" />
+		</p>
+
+		<p>
+			Disconnect the fan and remove all the screws, heatsink will easily come off:<br/>
+			<img src="x60_heatsink/0018.jpg" alt="" />
+		</p>
+
+		<p>
+			Remove the old paste with a cloth (from the CPU and heatsink) and then clean both of them with the <i>alc<a></a>h<b></b>oleel</i> (to remove remaining residue. typo is intentional).
+			Apply a pea-sized amount of paste to the both chipsets that the heatsink covered and spread it evenly (uniformally).
+			Finally reinstall the heatsink, reversing previous steps.
+		</p>
+
+		<p>
+			<b>stress -c 2</b> command can be used to push the CPU to 100%, and <b>xsensors</b> (or <b>watch sensors</b> command) can be used to monitor heat. 
+			Below 90C is ok.
+		</p>
+
+<hr/>
+
+	<p>
+		Copyright &copy; 2014 Francis Rowe, All Rights Reserved.<br/>
+		See <a href="../license.html">../license.html</a> for license conditions.
+	</p>
+
+</body>
+</html>
diff --git a/docs/howtos/x60_heatsink/0000.jpg b/docs/howtos/x60_heatsink/0000.jpg
new file mode 100644
index 0000000..ce0ec3b
--- /dev/null
+++ b/docs/howtos/x60_heatsink/0000.jpg
diff --git a/docs/howtos/x60_heatsink/0001.jpg b/docs/howtos/x60_heatsink/0001.jpg
new file mode 100644
index 0000000..2bbc0ca
--- /dev/null
+++ b/docs/howtos/x60_heatsink/0001.jpg
diff --git a/docs/howtos/x60_heatsink/0002.jpg b/docs/howtos/x60_heatsink/0002.jpg
new file mode 100644
index 0000000..b55db3b
--- /dev/null
+++ b/docs/howtos/x60_heatsink/0002.jpg
diff --git a/docs/howtos/x60_heatsink/0003.jpg b/docs/howtos/x60_heatsink/0003.jpg
new file mode 100644
index 0000000..c5799ae
--- /dev/null
+++ b/docs/howtos/x60_heatsink/0003.jpg
diff --git a/docs/howtos/x60_heatsink/0004.jpg b/docs/howtos/x60_heatsink/0004.jpg
new file mode 100644
index 0000000..cd47840
--- /dev/null
+++ b/docs/howtos/x60_heatsink/0004.jpg
diff --git a/docs/howtos/x60_heatsink/0005.jpg b/docs/howtos/x60_heatsink/0005.jpg
new file mode 100644
index 0000000..418c9d2
--- /dev/null
+++ b/docs/howtos/x60_heatsink/0005.jpg
diff --git a/docs/howtos/x60_heatsink/0006.jpg b/docs/howtos/x60_heatsink/0006.jpg
new file mode 100644
index 0000000..6d36d93
--- /dev/null
+++ b/docs/howtos/x60_heatsink/0006.jpg
diff --git a/docs/howtos/x60_heatsink/0007.jpg b/docs/howtos/x60_heatsink/0007.jpg
new file mode 100644
index 0000000..971ccdf
--- /dev/null
+++ b/docs/howtos/x60_heatsink/0007.jpg
diff --git a/docs/howtos/x60_heatsink/0008.jpg b/docs/howtos/x60_heatsink/0008.jpg
new file mode 100644
index 0000000..24e6526
--- /dev/null
+++ b/docs/howtos/x60_heatsink/0008.jpg
diff --git a/docs/howtos/x60_heatsink/0009.jpg b/docs/howtos/x60_heatsink/0009.jpg
new file mode 100644
index 0000000..d318395
--- /dev/null
+++ b/docs/howtos/x60_heatsink/0009.jpg
diff --git a/docs/howtos/x60_heatsink/0010.jpg b/docs/howtos/x60_heatsink/0010.jpg
new file mode 100644
index 0000000..5e6fdc7
--- /dev/null
+++ b/docs/howtos/x60_heatsink/0010.jpg
diff --git a/docs/howtos/x60_heatsink/0011.jpg b/docs/howtos/x60_heatsink/0011.jpg
new file mode 100644
index 0000000..101cf6a
--- /dev/null
+++ b/docs/howtos/x60_heatsink/0011.jpg
diff --git a/docs/howtos/x60_heatsink/0012.jpg b/docs/howtos/x60_heatsink/0012.jpg
new file mode 100644
index 0000000..dbb6669
--- /dev/null
+++ b/docs/howtos/x60_heatsink/0012.jpg
diff --git a/docs/howtos/x60_heatsink/0013.jpg b/docs/howtos/x60_heatsink/0013.jpg
new file mode 100644
index 0000000..2d2b9dd
--- /dev/null
+++ b/docs/howtos/x60_heatsink/0013.jpg
diff --git a/docs/howtos/x60_heatsink/0014.jpg b/docs/howtos/x60_heatsink/0014.jpg
new file mode 100644
index 0000000..733f997
--- /dev/null
+++ b/docs/howtos/x60_heatsink/0014.jpg
diff --git a/docs/howtos/x60_heatsink/0015.jpg b/docs/howtos/x60_heatsink/0015.jpg
new file mode 100644
index 0000000..1e81166
--- /dev/null
+++ b/docs/howtos/x60_heatsink/0015.jpg
diff --git a/docs/howtos/x60_heatsink/0016.jpg b/docs/howtos/x60_heatsink/0016.jpg
new file mode 100644
index 0000000..ea418a5
--- /dev/null
+++ b/docs/howtos/x60_heatsink/0016.jpg
diff --git a/docs/howtos/x60_heatsink/0017.jpg b/docs/howtos/x60_heatsink/0017.jpg
new file mode 100644
index 0000000..8a67482
--- /dev/null
+++ b/docs/howtos/x60_heatsink/0017.jpg
diff --git a/docs/howtos/x60_heatsink/0018.jpg b/docs/howtos/x60_heatsink/0018.jpg
new file mode 100644
index 0000000..98c43ac
--- /dev/null
+++ b/docs/howtos/x60_heatsink/0018.jpg
diff --git a/docs/howtos/x60_security.html b/docs/howtos/x60_security.html
new file mode 100644
index 0000000..fc9cb0b
--- /dev/null
+++ b/docs/howtos/x60_security.html
@@ -0,0 +1,171 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<meta charset="utf-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1">
+
+	<style type="text/css">
+		body {
+			background:#fff;
+			color:#000;
+			font-family:sans-serif;
+			font-size:1em;
+		}
+	</style>
+
+	<title>Libreboot documentation: Security on the ThinkPad X60</title>
+</head>
+
+<body>
+
+	<header>
+		<h1>Security on the ThinkPad X60</h1>
+		<aside>Hardware modifications to enhance security on the ThinkPad X60. This tutorial is <b>incomplete</b> at the time of writing.</aside>
+	</header>
+
+	<p>Or go <a href="../index.html">back to main index</a></p>
+
+	<h2>Table of Contents</h2>
+		<ul>
+			<li><a href="#hardware_requirements">Hardware Requirements</a></li>
+			<li><a href="#software_requirements">Software Requirements</a></li>
+			<li><a href="#procedure">The procedure</a></li>
+		</ul>
+
+	<h1 id="hardware_requirements">Hardware requirements</h1>
+		<ul>
+			<li>An X60</li>
+			<li>screwdriver</li>
+			<li>(in a later version of this tutorial: soldering iron and scalpel)</li>
+		</ul>
+
+	<h1 id="software_requirements">Software requirements</h1>
+		<ul>
+			<li>none (at least in the scope of the article as-is)</li>
+		</ul>
+
+	<h1 id="procedure">Disassembly</h1>
+
+		<p>
+			Firstly remove the bluetooth (if your X60 has this):<br/>
+			The marked screws are underneath those stickers (marked in those 3 locations at the bottom of the LCD assembly):<br/>
+			<img src="x60_security/0000_bluetooth0.jpg" alt="" /><br/>
+			Now gently pry off the bottom part of the front bezel, and the bluetooth module is on the left (easily removable):<br/>
+			<img src="x60_security/0000_bluetooth.jpg" alt="" /><br/>
+		</p>
+
+		<p>
+			If your model was WWAN, remove the simcard (check anyway):<br/>
+			Uncover those 2 screws at the bottom:<br/>
+			<img src="x60_security/0000_simcard0.jpg" alt="" /><br/>
+			SIM card is in the marked location:<br/>
+			<img src="x60_security/0000_simcard1.jpg" alt="" /><br/>
+			Replacement: USB dongle.
+		</p>
+
+		<p>
+			Now get into the motherboard.
+		</p>
+
+		<p>
+			Remove those screws:<br/>
+			<img src="x60_security/0000.jpg" alt="" />
+		</p>
+		<p>
+			Push the keyboard forward (carefully):<br/>
+			<img src="x60_security/0001.jpg" alt="" />
+		</p>
+		<p>
+			Lift the keyboard up and disconnect it from the board:<br/>
+			<img src="x60_security/0002.jpg" alt="" />
+		</p>
+		<p>
+			Grab the right-hand side of the chassis and force it off (gently) and pry up the rest of the chassis:<br/>
+			<img src="x60_security/0003.jpg" alt="" />
+		</p>
+		<p>
+			You should now have this:<br/>
+			<img src="x60_security/0004.jpg" alt="" />
+		</p>
+
+		<p>
+			The following is a summary of what you will remove (already done to this machine):<br/>
+			<img src="x60_security/0001_overview.jpg" alt="" /><br/>
+			Note: the blue lines represent antenna cables and modem cables. You don't need to remove these, but you can if you want
+			(to make it tidier after removing other parts). I removed the antenna wires, the modem jack, the modem cable and
+			also (on another model) a device inside the part where the wwan antenna goes (wasn't sure what it was, but I knew it wasn't needed). <b>This is optional</b>
+		</p>
+
+		<p>
+			Remove the microphone (can desolder it, but you can also easily pull it off with you hands). Already removed here:<br/>
+			<img src="x60_security/0001_microphone.jpg" alt="" /><br/>
+			We do not know what the built-in microcode (on the CPU) is doing. The theory is that it could be programmed to take commands that do something
+			and then the CPU returns results. (meaning, remote security hole). So we remove it, just in case.<br/>
+			Replacement: external microphone on USB or line-in jack.
+		</p>
+
+		<p>
+			Remove the modem:<br/>
+			<img src="x60_security/0001_modem.jpg" alt="" /><br/>
+			(useless, obsolete device)
+		</p>
+
+		<p>
+			Remove the speaker:<br/>
+			<img src="x60_security/0001_speaker.jpg" alt="" /><br/>
+			Reason: combined with the microphone issue, this could be used to leak data.<br/>
+			Replacement: headphones/speakers (line-out) or external DAC (USB).
+		</p>
+
+		<p>
+			Remove the wlan (also remove wwan if you have it):<br/>
+			<img src="x60_security/0001_wlan_wwan.jpg" alt="" /><br/>
+			Reason: has direct (and very fast) memory access, and could (theoretically) leak data over a side-channel.
+		</p>	
+
+		<h2>
+			Not covered yet:
+		</h2>	
+			<ul>
+				<li>Disable cardbus/pcmcia (has fast/direct memory access)</li>
+				<li>Disable firewire (has fast/direct memory access)</li>
+				<li>Disable flashing the ethernet firmware</li>
+				<li>Disable SPI flash writes (can be re-enabled by unsoldering two parts)</li>
+				<li>Disable use of xrandr/edid on external monitor (cut 2 pins on VGA)</li>
+				<li>Disable docking station</li>
+			</ul>
+			<p>
+				Go to <a href="http://media.ccc.de/browse/congress/2013/30C3_-_5529_-_en_-_saal_2_-_201312271830_-_hardening_hardware_and_choosing_a_goodbios_-_peter_stuge.html">http://media.ccc.de/browse/congress/2013/30C3_-_5529_-_en_-_saal_2_-_201312271830_-_hardening_hardware_and_choosing_a_goodbios_-_peter_stuge.html</a>
+				or directly to the video: <a href="http://mirror.netcologne.de/CCC/congress/2013/webm/30c3-5529-en-Hardening_hardware_and_choosing_a_goodBIOS_webm.webm">http://mirror.netcologne.de/CCC/congress/2013/webm/30c3-5529-en-Hardening_hardware_and_choosing_a_goodBIOS_webm.webm</a>.
+			</p>
+			<p>
+				A lot of this tutorial is based on that video. Look towards the second half of the video to see how to do the abev.
+			</p>
+
+		<h2>
+			Also not covered yet:
+		</h2>
+			<ul>
+				<li>
+					Intrusion detection: randomized seal on screws (need to research)
+				</li>
+				<li>
+					Tips about preventing/mitigating risk of cold boot attack.
+				</li>
+				<li>
+					Software-based security hardening (GRUB trust/cryptomount, kernel LUKS/ecryptfs, etc).
+				</li>
+				<li>
+					General tips/advice and web links showing how to detect physical intrusions.
+				</li>
+			</ul>
+
+<hr/>
+
+	<p>
+		Copyright &copy; 2014 Francis Rowe, All Rights Reserved.<br/>
+		See <a href="../license.html">../license.html</a> for license conditions.
+	</p>
+
+</body>
+</html>
diff --git a/docs/howtos/x60_security/0000.jpg b/docs/howtos/x60_security/0000.jpg
new file mode 100644
index 0000000..ce0ec3b
--- /dev/null
+++ b/docs/howtos/x60_security/0000.jpg
diff --git a/docs/howtos/x60_security/0000_bluetooth.jpg b/docs/howtos/x60_security/0000_bluetooth.jpg
new file mode 100644
index 0000000..94a255f
--- /dev/null
+++ b/docs/howtos/x60_security/0000_bluetooth.jpg
diff --git a/docs/howtos/x60_security/0000_bluetooth0.jpg b/docs/howtos/x60_security/0000_bluetooth0.jpg
new file mode 100644
index 0000000..a750b0c
--- /dev/null
+++ b/docs/howtos/x60_security/0000_bluetooth0.jpg
diff --git a/docs/howtos/x60_security/0000_simcard0.jpg b/docs/howtos/x60_security/0000_simcard0.jpg
new file mode 100644
index 0000000..40837ea
--- /dev/null
+++ b/docs/howtos/x60_security/0000_simcard0.jpg
diff --git a/docs/howtos/x60_security/0000_simcard1.jpg b/docs/howtos/x60_security/0000_simcard1.jpg
new file mode 100644
index 0000000..c0a5b35
--- /dev/null
+++ b/docs/howtos/x60_security/0000_simcard1.jpg
diff --git a/docs/howtos/x60_security/0001.jpg b/docs/howtos/x60_security/0001.jpg
new file mode 100644
index 0000000..2bbc0ca
--- /dev/null
+++ b/docs/howtos/x60_security/0001.jpg
diff --git a/docs/howtos/x60_security/0001_microphone.jpg b/docs/howtos/x60_security/0001_microphone.jpg
new file mode 100644
index 0000000..c419060
--- /dev/null
+++ b/docs/howtos/x60_security/0001_microphone.jpg
diff --git a/docs/howtos/x60_security/0001_modem.jpg b/docs/howtos/x60_security/0001_modem.jpg
new file mode 100644
index 0000000..6a7a6a0
--- /dev/null
+++ b/docs/howtos/x60_security/0001_modem.jpg
diff --git a/docs/howtos/x60_security/0001_overview.jpg b/docs/howtos/x60_security/0001_overview.jpg
new file mode 100644
index 0000000..7268e49
--- /dev/null
+++ b/docs/howtos/x60_security/0001_overview.jpg
diff --git a/docs/howtos/x60_security/0001_speaker.jpg b/docs/howtos/x60_security/0001_speaker.jpg
new file mode 100644
index 0000000..28d3ed6
--- /dev/null
+++ b/docs/howtos/x60_security/0001_speaker.jpg
diff --git a/docs/howtos/x60_security/0001_wlan_wwan.jpg b/docs/howtos/x60_security/0001_wlan_wwan.jpg
new file mode 100644
index 0000000..0db858d
--- /dev/null
+++ b/docs/howtos/x60_security/0001_wlan_wwan.jpg
diff --git a/docs/howtos/x60_security/0002.jpg b/docs/howtos/x60_security/0002.jpg
new file mode 100644
index 0000000..b55db3b
--- /dev/null
+++ b/docs/howtos/x60_security/0002.jpg
diff --git a/docs/howtos/x60_security/0003.jpg b/docs/howtos/x60_security/0003.jpg
new file mode 100644
index 0000000..c5799ae
--- /dev/null
+++ b/docs/howtos/x60_security/0003.jpg
diff --git a/docs/howtos/x60_security/0004.jpg b/docs/howtos/x60_security/0004.jpg
new file mode 100644
index 0000000..cd47840
--- /dev/null
+++ b/docs/howtos/x60_security/0004.jpg
diff --git a/docs/howtos/x60_unbrick.html b/docs/howtos/x60_unbrick.html
index 10f66b4..8427c5a 100644
--- a/docs/howtos/x60_unbrick.html
+++ b/docs/howtos/x60_unbrick.html
@@ -172,7 +172,8 @@
 			Programmer is now active:<br/>
 			<img src="x60_unbrick/0023.jpg" alt="" /><br/>
 			Now I install flashrom on the T60 (running Trisquel GNU/Linux) and do this:<br/>
-			<b>flashrom -p buspirate_spi:dev=/dev/ttyUSB0 -w coreboot.rom</b><br/>
+			<b>flashrom -p buspirate_spi:dev=/dev/ttyUSB0 -w bin/x60/libreboot_usqwerty.rom</b><br/>
+			Note: there are also other ROM images for X60<br/>
 			Note: this is using buspirate as the programmer, so it is flashing the X60, not the T60!<br/>
 			Here's my terminal window on the T60:<br/>
 			<img src="x60_unbrick/0025.jpg" alt="" /><br/>
diff --git a/docs/index.html b/docs/index.html
index 8e8f2de..37fdd38 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -61,6 +61,8 @@
 			<li><a href="#supported_t60_list">List of supported ThinkPad T60's</a></li>
 			<li><a href="#t60_inverter">Inverter boards for ThinkPad T60 when upgrading the LCD panel.</a></li>
 			<li><a href="#t60_ati_intel">ThinkPad T60 (ATI GPU) and ThinkPad T60 (Intel GPU) differences.</a></li>
+			<li><a href="howtos/x60_heatsink.html">ThinkPad X60: change the fan/heatsink</a></li>
+			<li><a href="howtos/x60_security.html">ThinkPad X60: security</a></li>
 		</ul>
 
 	<h2>Macbook2,1</h2>
@@ -92,13 +94,15 @@
 							<li><a href="#keyboards_usqwerty">QWERTY (United States)</a></li>
 							<li><a href="#keyboards_ukdvorak">Dvorak (United Kingdom)</a></li>
 							<li><a href="#keyboards_usdvorak">Dvorak (United States)</a></li>
+							<li><a href="#keyboards_frazerty">AZERTY (French)</a></li>
 						</ul>
 					</li>
 					<li><a href="#grub_custom_keyboard">Custom keyboard layout in GRUB</a></li>
 					<li><a href="#grub_qwerty_keyboard">US Qwerty keyboard layout in GRUB</a></li>
 					<li><a href="#grub_ukqwerty_keyboard">UK Qwerty keyboard layout in GRUB</a></li>
 					<li><a href="#grub_dvorak_keyboard">US Dvorak keyboard layout in GRUB</a></li>
-					<li><a href="#grub_ukdvorak_keyboard">UK Dvorak layout in GRUB</a></li>
+					<li><a href="#grub_ukdvorak_keyboard">UK Dvorak keyboard layout in GRUB</a></li>
+					<li><a href="#grub_frazerty_keyboard">FR AZERTY keyboard layout in GRUB</a></li>
 				</ul>
 			</li>
 		</ul>
@@ -301,7 +305,7 @@
 			</p>
 
 		<h2 id="config_x60">
-			ThinkPad X60 configuration (file: resources/libreboot/config/x60config)
+			ThinkPad X60 configuration (file: resources/libreboot/config/x60/config)
 		</h2>
 			<ul>
 				<li>General setup / Expert mode = <i>enable</i></li>
@@ -328,7 +332,7 @@
 				<li>Devices / Run Option ROMs on PCI devices = <i>disable</i></li>
 			</ul>
 			<p>
-				The resulting .config file was saved as resources/libreboot/config/<b>x60config</b> and is used by the build
+				The resulting .config file was saved as resources/libreboot/config/<b>x60/config</b> and is used by the build
 				scripts for this machine.
 			</p>
 			<p>
@@ -340,7 +344,7 @@
 			</p>
 
 		<h2 id="config_x60t">
-			ThinkPad X60 Tablet configuration (file: resources/libreboot/config/x60tconfig)
+			ThinkPad X60 Tablet configuration (file: resources/libreboot/config/x60t/config)
 		</h2>
 			<ul>
 				<li>General setup / Expert mode = <i>enable</i></li>
@@ -367,7 +371,7 @@
 				<li>Devices / Run Option ROMs on PCI devices = <i>disable</i></li>
 			</ul>
 			<p>
-				The resulting .config file was saved as resources/libreboot/config/<b>x60config</b> and is used by the build
+				The resulting .config file was saved as resources/libreboot/config/<b>x60t/config</b> and is used by the build
 				scripts for this machine.
 			</p>
 			<p>
@@ -375,7 +379,7 @@
 			</p>
 
 		<h2 id="config_t60">
-			ThinkPad T60 configuration (file: resources/libreboot/config/t60config)
+			ThinkPad T60 configuration (file: resources/libreboot/config/t60/config)
 		</h2>
 			<ul>
 				<li>General setup / Expert mode = <i>enable</i></li>
@@ -400,7 +404,7 @@
 				<li>Devices / Run Option ROMs on PCI devices = <i>disable</i></li>
 			</ul>
 			<p>
-				The resulting .config file was saved as resources/libreboot/config/<b>t60config</b> and is used by the build
+				The resulting .config file was saved as resources/libreboot/config/<b>t60/config</b> and is used by the build
 				scripts for this machine.
 			</p>	
 			<p>
@@ -409,7 +413,7 @@
 			</p>
 
 		<h2 id="config_macbook21">
-			MacBook2,1 configuration (file: resources/libreboot/config/macbook21config)
+			MacBook2,1 configuration (file: resources/libreboot/config/macbook21/config)
 		</h2>
 			<ul>
 				<li>General / Expert mode = <i>enable</i></li>
@@ -435,7 +439,7 @@
 				<li>Devices / Run Option ROMs on PCI devices = <i>disable</i></li>
 			</ul>
 			<p>
-				The resulting .config file was saved as resources/libreboot/config/<b>macbook21config</b> and is used by the build
+				The resulting .config file was saved as resources/libreboot/config/<b>macbook21/config</b> and is used by the build
 				scripts for this machine.
 			</p>
 
@@ -531,6 +535,30 @@
 			</li>
 		</ul>
 
+		<div class="important">
+			<p>
+				A user with 2 T60's, each with a Core 2 Duo T7200 processor tried libreboot on each machine.
+				One worked, one did not. It should be explained that in addition to the microcode (on the CPU),
+				updates are usually supplied in coreboot (from Intel) which patch the onboard microcode to fix bugs. 
+				Errata's can be found at <a href="http://download.intel.com/design/mobile/SPECUPDT/30922214.pdf">http://download.intel.com/design/mobile/SPECUPDT/30922214.pdf</a>
+				and <a href="http://download.intel.com/design/mobile/SPECUPDT/31407918.pdf">http://download.intel.com/design/mobile/SPECUPDT/31407918.pdf</a>.
+				These microcode updates are not included in libreboot because they are proprietary (blobs). Most CPU's work fine without them: hundreds
+				of Core Duo T2300/T2400/T2500/L2300/L2400/L2500 processors have been tested on the X60, and a few T5600 CPU's have been tested on the T60 (and X60 and all work).
+				In the case of the T7200, it was found that one of the two tested had instability issues (kernel panics) without the updates: work is being done to find out 
+				exactly what version of the microcode that particular CPU had in this case.
+				If you find that your CPU gives you similar issues (after trying libreboot), the current workaround is to simply try another CPU
+				(fortunately, the CPU's in the T60 are installed in a socket so replacing them is easy).
+			</p>
+			<p>
+				There might be a patched kernel that can be used, or a kernel parameter that can be used in GRUB to work around these (rare) buggy CPU's
+				(it is unknown at the moment whether this is possible).
+				The Core 2 Duo T7600 is untested, but will be tested soon (the lead developer of libreboot project has 3 of them to try out). 
+			</p>
+			<p>
+				If reading this for 2nd beta, note that any debugging obtained so far will be included in the 3rd beta.
+			</p>
+		</div>
+
 		<p>
 			To find what LCD panel you have, see: <a href="#get_edid_panelname">#get_edid_panelname</a>.
 		</p>
@@ -785,6 +813,10 @@
 		</p>
 
 		<p>
+			There is a 15.4&quot; T60 with Intel graphics, which might work. (untested at the time of writing). <b>Note to self: REMOVE THIS WHEN TESTED</b>.
+		</p>
+
+		<p>
 			The following T60 motherboard shows an ATI GPU (<b>do not buy this</b>) (highlighted in red, or on the right next to the white CPU socket), which is unsupported by libreboot:<br/>
 			<img src="howtos/t60_mainboard/t60_ati_gpu.jpg" alt="" />
 		</p>
@@ -900,55 +932,62 @@
 			<li>
 				ThinkPad X60, X60s (<b>bin/x60/</b>)
 				<ul>
-					<li>US Qwerty keyboard, no dock: <b>coreboot.rom</b></li>
-					<li>US Dvorak keyboard, no dock: <b>coreboot_dvorak.rom</b></li>
-					<li>US Qwerty keyboard, with dock: <b>coreboot_serial.rom</b></li>
-					<li>US Dvorak keyboard, with dock: <b>coreboot_serial_dvorak.rom</b></li>
-					<li>UK Qwerty keyboard, no dock: <b>coreboot_ukqwerty.rom</b></li>
-					<li>UK Dvorak keyboard, no dock: <b>coreboot_ukdvorak.rom</b></li>
-					<li>UK Qwerty keyboard, with dock: <b>coreboot_serial_ukqwerty.rom</b></li>
-					<li>UK Dvorak keyboard, with dock: <b>coreboot_serial_ukdvorak.rom</b></li>
+					<li>US Qwerty keyboard, no dock: <b>libreboot_usqwerty.rom</b></li>
+					<li>UK Qwerty keyboard, no dock: <b>libreboot_ukqwerty.rom</b></li>
+					<li>US Dvorak keyboard, no dock: <b>libreboot_usdvorak.rom</b></li>
+					<li>UK Dvorak keyboard, no dock: <b>libreboot_ukdvorak.rom</b></li>
+					<li>FR Azerty keyboard, no dock: <b>libreboot_frazerty.rom</b></li>
+					<li>US Qwerty keyboard, with dock: <b>libreboot_serial_usqwerty.rom</b></li>
+					<li>UK Qwerty keyboard, with dock: <b>libreboot_serial_ukqwerty.rom</b></li>
+					<li>US Dvorak keyboard, with dock: <b>libreboot_serial_usdvorak.rom</b></li>
+					<li>UK Dvorak keyboard, with dock: <b>libreboot_serial_ukdvorak.rom</b></li>
+					<li>FR Azerty keyboard, with dock: <b>libreboot_serial_frazerty.rom</b></li>
 				</ul>
 			</li>
 			<li>
 				ThinkPad X60 Tablet (<b>bin/x60t/</b>)
 				<ul>
-					<li>US Qwerty keyboard, no dock: <b>coreboot.rom</b></li>
-					<li>US Dvorak keyboard, no dock: <b>coreboot_dvorak.rom</b></li>
-					<li>US Qwerty keyboard, with dock: <b>coreboot_serial.rom</b></li>
-					<li>US Dvorak keyboard, with dock: <b>coreboot_serial_dvorak.rom</b></li>
-					<li>UK Qwerty keyboard, no dock: <b>coreboot_ukqwerty.rom</b></li>
-					<li>UK Dvorak keyboard, no dock: <b>coreboot_ukdvorak.rom</b></li>
-					<li>UK Qwerty keyboard, with dock: <b>coreboot_serial_ukqwerty.rom</b></li>
-					<li>UK Dvorak keyboard, with dock: <b>coreboot_serial_ukdvorak.rom</b></li>
+					<li>US Qwerty keyboard, no dock: <b>libreboot_usqwerty.rom</b></li>
+					<li>UK Qwerty keyboard, no dock: <b>libreboot_ukqwerty.rom</b></li>
+					<li>US Dvorak keyboard, no dock: <b>libreboot_usdvorak.rom</b></li>
+					<li>UK Dvorak keyboard, no dock: <b>libreboot_ukdvorak.rom</b></li>
+					<li>FR Azerty keyboard, no dock: <b>libreboot_frazerty.rom</b></li>
+					<li>US Qwerty keyboard, with dock: <b>libreboot_serial_usqwerty.rom</b></li>
+					<li>UK Qwerty keyboard, with dock: <b>libreboot_serial_ukqwerty.rom</b></li>
+					<li>US Dvorak keyboard, with dock: <b>libreboot_serial_usdvorak.rom</b></li>
+					<li>UK Dvorak keyboard, with dock: <b>libreboot_serial_ukdvorak.rom</b></li>
+					<li>FR Azerty keyboard, with dock: <b>libreboot_serial_frazerty.rom</b></li>
 				</ul>
 			</li>
 			<li>
 				ThinkPad T60 (<b>bin/t60/</b>) (note, see <a href="#supported_t60_list">#supported_t60_list</a>)
 				<ul>
-					<li>US Qwerty keyboard, no dock: <b>coreboot.rom</b></li>
-					<li>US Dvorak keyboard, no dock: <b>coreboot_dvorak.rom</b></li>
-					<li>US Qwerty keyboard, with dock: <b>coreboot_serial.rom</b></li>
-					<li>US Dvorak keyboard, with dock: <b>coreboot_serial_dvorak.rom</b></li>
-					<li>UK Qwerty keyboard, no dock: <b>coreboot_ukqwerty.rom</b></li>
-					<li>UK Dvorak keyboard, no dock: <b>coreboot_ukdvorak.rom</b></li>
-					<li>UK Qwerty keyboard, with dock: <b>coreboot_serial_ukqwerty.rom</b></li>
-					<li>UK Dvorak keyboard, with dock: <b>coreboot_serial_ukdvorak.rom</b></li>
+					<li>US Qwerty keyboard, no dock: <b>libreboot_usqwerty.rom</b></li>
+					<li>UK Qwerty keyboard, no dock: <b>libreboot_ukqwerty.rom</b></li>
+					<li>US Dvorak keyboard, no dock: <b>libreboot_usdvorak.rom</b></li>
+					<li>UK Dvorak keyboard, no dock: <b>libreboot_ukdvorak.rom</b></li>
+					<li>FR Azerty keyboard, no dock: <b>libreboot_frazerty.rom</b></li>
+					<li>US Qwerty keyboard, with dock: <b>libreboot_serial_usqwerty.rom</b></li>
+					<li>UK Qwerty keyboard, with dock: <b>libreboot_serial_ukqwerty.rom</b></li>
+					<li>US Dvorak keyboard, with dock: <b>libreboot_serial_usdvorak.rom</b></li>
+					<li>UK Dvorak keyboard, with dock: <b>libreboot_serial_ukdvorak.rom</b></li>
+					<li>FR Azerty keyboard, with dock: <b>libreboot_serial_frazerty.rom</b></li>
 				</ul>
 			</li>
 			<li>
 				MacBook2,1 (<b>bin/macbook21/</b>)
 				<ul>
-					<li>US Qwerty keyboard, no dock: <b>coreboot.rom</b></li>
-					<li>US Dvorak keyboard, no dock: <b>coreboot_dvorak.rom</b></li>
-					<li>UK Qwerty keyboard, no dock: <b>coreboot_ukqwerty.rom</b></li>
-					<li>UK Dvorak keyboard, no dock: <b>coreboot_ukdvorak.rom</b></li>
-					<li>(The MacBook2,1 uses the same chipset, i945, as the X60/X60s X60T and T60 but there is no dock or serial port available for this machine)</li>
+					<li>US Qwerty keyboard: <b>libreboot_usqwerty.rom</b></li>
+					<li>UK Qwerty keyboard: <b>libreboot_ukqwerty.rom</b></li>
+					<li>US Dvorak keyboard: <b>libreboot_usdvorak.rom</b></li>
+					<li>UK Dvorak keyboard: <b>libreboot_ukdvorak.rom</b></li>
+					<li>FR Azerty keyboard: <b>libreboot_frazerty.rom</b></li>
+					<li>The MacBook2,1 uses the same chipset, i945, as the X60/X60s X60T and T60 but there is no dock or serial port available for this machine.</li>
 				</ul>
 			</li>
 		</ul>
 		<p>
-			This will give you your native keyboard layout in GRUB. The preferences in your OS are not affected, it just makes using
+			This will give you your native keyboard layout inside GRUB. The preferences in your OS are not affected, it just makes using
 			the GRUB command line easier (if you ever need to do that).
 			<a href="#grub_keyboard">#grub_keyboard</a>shows you how this was done. If your native keyboard layout
 			differs, you can adapt those notes and hack the 'build' script for your needs.
@@ -981,8 +1020,6 @@
 
 		</div>
 
-		<p>(the above message is a lot more benign and a lot less scary than it looks)</p>
-
 		<p><b>This is for the ThinkPad X60 and T60 while running Lenovo BIOS. If you already have coreboot or libreboot running,
 		then go to <a href="#flashrom">#flashrom</a> instead!</b></p>
 
@@ -1025,12 +1062,27 @@
 			</p>
 
 			<p>
-				If the above is what you see, then <b>SHUT DOWN</b>. Wait a few seconds, and then boot; libreboot is running, but there is a 2nd procedure needed (see below).
+				If the above is what you see, then <b>SHUT DOWN</b>. Wait a few seconds, and then boot; libreboot is running, but there is a 2nd procedure <b>*needed*</b> (see below).
 			</p>
 
 		</div>
 
 		<p>
+			<b>
+				If you boot and you see nothing, try turning up the backlight (Fn+Home).
+				If this is a ThinkPad X60 and backlight resets to zero when turning it up while at max, look at <a href="#tft_brightness">#tft_brightness</a>.
+			</b>
+		</p>
+
+		<p>
+			<b>
+				After the 2nd flash, if this is a ThinkPad X60 then you can look at <a href="#x60_wifi">#x60_wifi</a> for how to enable/disable wifi.
+				You can also look at <a href="#x60_trackpoint">#x60_trackpoint</a> for how to enable/disable the trackpoint (red mouse on keyboard).
+				You might want to do the 2nd flash first (see below) before doing that.
+			</b>
+		</p>
+
+		<p>
 			When you have booted up again:<br/>
 			<b>$ sudo ./lenovobios_secondflash bin/<a href="#rom">YOURBOARD/YOURROM</a></b>
 		</p>
@@ -1051,10 +1103,6 @@
 
 		</div>
 
-		<p>
-			!!!!
-		</p>
-
 		<p><a href="#pagetop">Back to top of page.</a></p>
 
 <hr/>
@@ -1094,6 +1142,20 @@
 			after you see this, and then boot up again after a few seconds.
 		</p>
 
+		<p>
+			<b>
+				If you boot and you see nothing, try turning up the backlight (Fn+Home). 
+				If this is a ThinkPad X60 and backlight resets to zero when turning it up while at max, look at <a href="#tft_brightness">#tft_brightness</a>.
+			</b>
+		</p>
+
+		<p>
+			<b>
+				If this is a ThinkPad X60 then you can look at <a href="#x60_wifi">#x60_wifi</a> for how to enable/disable wifi.
+				You can also look at <a href="#x60_trackpoint">#x60_trackpoint</a> for how to enable/disable the trackpoint (red mouse on keyboard).
+			</b>
+		</p>
+
 		<p><a href="#pagetop">Back to top of page</a></p>
 
 <hr/>
@@ -1135,35 +1197,64 @@
 
 			<p>
 				Taken from WikiPedia. 
-				See <a href="https://en.wikipedia.org/wiki/Dvorak_Simplified_Keyboard">https://en.wikipedia.org/wiki/Dvorak_Simplified_Keyboard</a>
-				and <a href="https://en.wikipedia.org/wiki/QWERTY">https://en.wikipedia.org/wiki/QWERTY</a>.
+				See <a href="https://en.wikipedia.org/wiki/Dvorak_Simplified_Keyboard">https://en.wikipedia.org/wiki/Dvorak_Simplified_Keyboard</a>,
+				<a href="https://en.wikipedia.org/wiki/QWERTY">https://en.wikipedia.org/wiki/QWERTY</a>
+				and <a href="https://en.wikipedia.org/wiki/AZERTY">https://en.wikipedia.org/wiki/AZERTY</a>.
 			</p>
 
 			<h3 id="keyboards_ukqwerty">QWERTY (United Kingdom)</h3>
-			<p>
-				<a href="https://upload.wikimedia.org/wikipedia/commons/thumb/d/da/KB_United_Kingdom.svg/900px-KB_United_Kingdom.svg.png">https://upload.wikimedia.org/wikipedia/commons/thumb/d/da/KB_United_Kingdom.svg/900px-KB_United_Kingdom.svg.png</a>
-			</p>
+				<p>
+					<a href="https://upload.wikimedia.org/wikipedia/commons/thumb/d/da/KB_United_Kingdom.svg/900px-KB_United_Kingdom.svg.png">https://upload.wikimedia.org/wikipedia/commons/thumb/d/da/KB_United_Kingdom.svg/900px-KB_United_Kingdom.svg.png</a>
+				</p>
 
 			<h3 id="keyboards_usqwerty">QWERTY (United States)</h3>
-			<p>
-				<a href="https://upload.wikimedia.org/wikipedia/commons/thumb/5/51/KB_United_States-NoAltGr.svg/900px-KB_United_States-NoAltGr.svg.png">https://upload.wikimedia.org/wikipedia/commons/thumb/5/51/KB_United_States-NoAltGr.svg/900px-KB_United_States-NoAltGr.svg.png</a>
-			</p>
+				<p>
+					<a href="https://upload.wikimedia.org/wikipedia/commons/thumb/5/51/KB_United_States-NoAltGr.svg/900px-KB_United_States-NoAltGr.svg.png">https://upload.wikimedia.org/wikipedia/commons/thumb/5/51/KB_United_States-NoAltGr.svg/900px-KB_United_States-NoAltGr.svg.png</a>
+				</p>
 
 			<h3 id="keyboards_ukdvorak">Dvorak (United Kingdom)</h3>
+				<p>
+					<a href="https://upload.wikimedia.org/wikipedia/commons/thumb/c/cc/KB_United_Kingdom_Dvorak.svg/900px-KB_United_Kingdom_Dvorak.svg.png">https://upload.wikimedia.org/wikipedia/commons/thumb/c/cc/KB_United_Kingdom_Dvorak.svg/900px-KB_United_Kingdom_Dvorak.svg.png</a>
+				</p>
+
+			<h3 id="keyboards_usdvorak">Dvorak (United States)</h3>
+				<p>
+					<a href="https://upload.wikimedia.org/wikipedia/commons/thumb/2/25/KB_United_States_Dvorak.svg/800px-KB_United_States_Dvorak.svg.png">https://upload.wikimedia.org/wikipedia/commons/thumb/2/25/KB_United_States_Dvorak.svg/800px-KB_United_States_Dvorak.svg.png</a>
+				</p>
+
+			<h3 id="keyboards_azerty">AZERTY (French)</h3>
+				<p>
+					<a href="https://upload.wikimedia.org/wikipedia/commons/thumb/b/b9/KB_France.svg/800px-KB_France.svg.png">https://upload.wikimedia.org/wikipedia/commons/thumb/b/b9/KB_France.svg/800px-KB_France.svg.png</a>
+				</p>
+
+			<p><a href="#pagetop">Back to top of page</a></p>
+
+		<h2 id="grub_custom_keyboard">Custom keyboard layout in GRUB (for reference)</h2>
+
 			<p>
-				<a href="https://upload.wikimedia.org/wikipedia/commons/thumb/c/cc/KB_United_Kingdom_Dvorak.svg/900px-KB_United_Kingdom_Dvorak.svg.png">https://upload.wikimedia.org/wikipedia/commons/thumb/c/cc/KB_United_Kingdom_Dvorak.svg/900px-KB_United_Kingdom_Dvorak.svg.png</a>
+				Keymaps are stored in resources/grub/keymap/original (original files) and resources/grub/keymap (.gkb files).
 			</p>
 
-			<h3 id="keyboards_usdvorak">Dvorak (United States)</h3>
 			<p>
-				<a href="https://upload.wikimedia.org/wikipedia/commons/thumb/2/25/KB_United_States_Dvorak.svg/800px-KB_United_States_Dvorak.svg.png">https://upload.wikimedia.org/wikipedia/commons/thumb/2/25/KB_United_States_Dvorak.svg/800px-KB_United_States_Dvorak.svg.png</a>
+				Example (French Azerty):<br/>
+				<b>$ ckbcomp fr > frazerty</b><br/><br/>
+				Go in grub directory:<br/>
+				<b>cat frazerty | ./grub/grub-mklayout -o frazerty.gkb</b>
 			</p>
 
-			<p><a href="#pagetop">Back to top of page</a></p>
+			<p>
+				You must make sure that the files are named keymap and keymap.gkb (where 'keymap' can be whatever you want).
+			</p>
 
-		<h2 id="grub_custom_keyboard">Custom keyboard layout in GRUB (for reference)</h2>
+			<p>
+				Then from the above example, you would put <b>frazerty</b> in <b>resources/grub/keymap/original/</b> and
+				the <b>frazerty.gkb</b> file goes under <b>resources/grub/keymap/</b>
+			</p>
 
-			<p>You can adapt the notes below and update the 'build' script to make it build a ROM with your custom/other keyboard layout in GRUB.</p>
+			<p>
+				The scripts <b>build</b> and <b>buildrom-withgrub</b> will automatically see this, and automatically build
+				ROM's with your custom layout (given the name) and include them under bin. Example: <b>libreboot_frazerty.rom</b>.
+			</p>
 
 			<p><a href="#pagetop">Back to top of page</a></p>
 
@@ -1210,7 +1301,7 @@
 
 		<h2 id="grub_ukdvorak_keyboard">UK Dvorak keyboard layout in GRUB (for reference)</h2>
 
-			<p>There isn't much difference.<br/>
+			<p>There isn't much difference to US Dvorak.<br/>
 			<b>$ cp usdvorak ukdvorak</b></p>
 
 			<p>Patch ukdvorak like so (diff usdvorak ukdvorak):<br/>
@@ -1221,6 +1312,21 @@
 
 			<p>Note: these files are already included ('build' script makes use of them). You don't need to do any of this.</p>
 
+		<h2 id="grub_frazerty_keyboard">FR AZERTY keyboard layout in GRUB (for reference)</h2>
+
+			<p>How the frazerty.gkb was made (for FR AZERTY layout in GRUB).</p>
+
+			<p><b>$ cd libreboot_src/grub</b><br/>
+			compile grub ('build' script has the info on how to do this)<br/>
+			come back out into libreboot_src:<br/>
+			<b>$ cd ../</b></p>
+
+			<p>Generate the layout file:<br/>
+			<b>$ ckbcomp fr > frazerty</b><br/>
+			<b>$ cat frazerty | ./grub/grub-mklayout -o frazerty.gkb</b></p>
+
+			<p>Note: these files are already included ('build' script makes use of them). You don't need to do it.</p>
+
 		<p><a href="#pagetop">Back to top of page</a></p>
 
 <hr/>
@@ -1235,7 +1341,7 @@
 		<b>$ sudo apt-get install build-essential</b>
 	</p>
 	<p>
-		Go into the libreboot_src directory. Under coreboot/util/nvramtool/ do that to compile it:
+		Go into the libreboot_src directory. Under coreboot/util/nvramtool/ do that to compile it:<br/>
 		<b>$ make</b>
 	</p>
 	<p>
@@ -1416,6 +1522,10 @@ WantedBy=multi-user.target
 <pre>
 	Unlisted note: http://inertiawar.com/microcode/
 	(link published to coreboot mailing list on July 8, 2014)
+
+	This page talks about 'calibration' in powertop:
+	https://docs.fedoraproject.org/en-US/Fedora/15/html/Power_Management_Guide/PowerTOP.html
+	I should think about adapting information here based on that page.
 </pre>
 
 <hr/>