diff --git a/.gitignore b/.gitignore
index 045f9698085..9f9d39491dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
Documentation/
LUFA/StudioIntegration/ProjectGenerator/*
LUFA/StudioIntegration/DocBook/*
+!LUFA/StudioIntegration/Docbook/mshelp/*
diff --git a/LUFA/DoxygenPages/ChangeLog.txt b/LUFA/DoxygenPages/ChangeLog.txt
index dfb4eb18cf0..443787aee5d 100644
--- a/LUFA/DoxygenPages/ChangeLog.txt
+++ b/LUFA/DoxygenPages/ChangeLog.txt
@@ -12,6 +12,7 @@
* - Added new PROGMEM variant send functions to the CDC class device driver (thanks to Stefan Hellermann)
* - Added new PROGMEM variant send functions to the CDC class host driver
* - Added additional Arduino Uno board definitions for the main processor reset (thanks to NicoHood)
+ * - Added modified DocBook transforms to generate Atmel Studio 6/7 internal help documentation (thanks to Morten Engelhardt Olsen)
*
* Changed:
* - Core:
diff --git a/LUFA/StudioIntegration/Docbook/mshelp/README.txt b/LUFA/StudioIntegration/Docbook/mshelp/README.txt
new file mode 100644
index 00000000000..4f251cc0b81
--- /dev/null
+++ b/LUFA/StudioIntegration/Docbook/mshelp/README.txt
@@ -0,0 +1,13 @@
+This is a modified/updated version of the Microsoft HV1 Docbook transform, written by Morten Engelhardt Olsen,
+
+Originally posted at http://sourceforge.net/p/docbook/feature-requests/461/, this has been further updated by Morten to make it compatible with more recent DocBook versions.
+
+ ---------------------------
+/ This documentation system \
+\ is udderly ridiculous! /
+ ---------------------------
+ \ ^__^
+ \ (oo)\_______
+ (__)\ )\/\
+ ||----w |
+ || ||
diff --git a/LUFA/StudioIntegration/Docbook/mshelp/docbook.xsl b/LUFA/StudioIntegration/Docbook/mshelp/docbook.xsl
new file mode 100644
index 00000000000..03b81feafc9
--- /dev/null
+++ b/LUFA/StudioIntegration/Docbook/mshelp/docbook.xsl
@@ -0,0 +1,58 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/LUFA/StudioIntegration/Docbook/mshelp/hv1-common.xsl b/LUFA/StudioIntegration/Docbook/mshelp/hv1-common.xsl
new file mode 100644
index 00000000000..b6f2610680d
--- /dev/null
+++ b/LUFA/StudioIntegration/Docbook/mshelp/hv1-common.xsl
@@ -0,0 +1,664 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ en-US
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ en-US
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ bk
+
+
+
+
+
+
+
+
+
+
+
+ ar
+
+
+
+
+
+
+
+
+
+
+
+ pr
+
+
+
+
+
+
+
+
+
+
+
+ ch
+
+
+
+
+
+
+
+
+
+
+
+ ap
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ pt
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ rn
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ re
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ co
+
+
+
+
+
+
+
+ s
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ bi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ go
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ix
+
+
+
+
+ si
+
+
+
+
+ chunk-filename-error-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $product.name needs to be set to generate ms.help style links
+
+
+
+
+ $product.version needs to be set to generate ms.help style links
+
+
+
+
+ $product.locale needs to be set to generate ms.help style links
+
+
+
+ ms.help?method=page&id=
+
+ &product=
+
+ &productVersion=
+
+ &locale=
+
+
+
+ #
+
+
+
+
+
+ ms-xhelp:///?Id=
+
+
+
+
+
+
+
+
+
+
+
+
+
+ preserve
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ :
+
+ ,
+
+
+
+
+
+
+ ,
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/LUFA/StudioIntegration/Docbook/mshelp/placeholder.txt b/LUFA/StudioIntegration/Docbook/mshelp/placeholder.txt
deleted file mode 100644
index c72e8875068..00000000000
--- a/LUFA/StudioIntegration/Docbook/mshelp/placeholder.txt
+++ /dev/null
@@ -1 +0,0 @@
-Copy the Microsoft HV1 Docbook transform contents into this directory (i.e. with the XSLT files in the current folder). The HV1 transform proposal can be found at http://sourceforge.net/p/docbook/feature-requests/461/ .
diff --git a/LUFA/StudioIntegration/VSIX/LUFA.dll b/LUFA/StudioIntegration/VSIX/LUFA.dll
index 4f8ea43bfe4..9917a9314c0 100644
Binary files a/LUFA/StudioIntegration/VSIX/LUFA.dll and b/LUFA/StudioIntegration/VSIX/LUFA.dll differ