diff --git a/LUFA/StudioIntegration/VSIX/[Content_Types].xml b/LUFA/StudioIntegration/VSIX/[Content_Types].xml
index bb630d84ed..8a20e77f34 100644
--- a/LUFA/StudioIntegration/VSIX/[Content_Types].xml
+++ b/LUFA/StudioIntegration/VSIX/[Content_Types].xml
@@ -1,22 +1,7 @@
 <Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types">
   <Default Extension="vsixmanifest" ContentType="text/xml"/>
-
-  <Default Extension="jpg" ContentType="image/jpg"/>
   <Default Extension="png" ContentType="application/octet-stream"/>
-  <Default Extension="bmp" ContentType="application/octet-stream"/>
-
-  <Default Extension="c" ContentType="application/octet-stream"/>
-  <Default Extension="h" ContentType="application/octet-stream"/>
-  <Default Extension="S" ContentType="application/octet-stream"/>
-
   <Default Extension="txt" ContentType="text/plain"/>
-
-  <Default Extension="conf" ContentType="application/octet-stream"/>
-  <Default Extension="inf" ContentType="application/octet-stream"/>
-
   <Default Extension="xml" ContentType="text/xml"/>
-
-  <Default Extension="css" ContentType="application/octet-stream"/>
-  <Default Extension="html" ContentType="text/html"/>
-  <Default Extension="js" ContentType="application/octet-stream"/>
+  <Default Extension="zip" ContentType="application/octet-stream"/>
 </Types>
diff --git a/LUFA/StudioIntegration/VSIX/asf-manifest.xml b/LUFA/StudioIntegration/VSIX/asf-manifest.xml
new file mode 100644
index 0000000000..511e743f69
--- /dev/null
+++ b/LUFA/StudioIntegration/VSIX/asf-manifest.xml
@@ -0,0 +1,18 @@
+<AsfContentProvider Version="1.0.0">
+  <Identifier Id="0e160d5c-e331-48d9-850b-e0387912171b">
+    <Org>FourWalledCubicle</Org>
+    <ShortName>LUFA</ShortName>
+    <Author>Dean Camera</Author>
+    <Description></Description>
+    <FollowFolderStructure>True</FollowFolderStructure>
+  </Identifier>
+  <AsfContent Type="zip" Path="contents.zip">
+    <Content>
+      <Version></Version>
+      <HelpURL/>
+      <Locator/>
+      <DbXMLPath>content.xml.cache</DbXMLPath>
+      <Description/>
+    </Content>
+  </AsfContent>
+</AsfContentProvider>
diff --git a/LUFA/StudioIntegration/VSIX/extension.vsixmanifest b/LUFA/StudioIntegration/VSIX/extension.vsixmanifest
index 8dd6de0917..6be9f6a66b 100644
--- a/LUFA/StudioIntegration/VSIX/extension.vsixmanifest
+++ b/LUFA/StudioIntegration/VSIX/extension.vsixmanifest
@@ -8,9 +8,9 @@
 		<MoreInfoUrl>http://www.lufa-lib.org</MoreInfoUrl>
 		<Description xml:space="preserve">LUFA USB Framework</Description>
 
-		<License>LUFA\License.txt</License>
-		<Icon>LUFA\DoxygenPages\Images\LUFA_thumb.png</Icon>
-		<PreviewImage>LUFA\DoxygenPages\Images\LUFA.png</PreviewImage>
+		<License>License.txt</License>
+		<Icon>PreviewThumb.png</Icon>
+		<PreviewImage>Preview.png</PreviewImage>
 
 		<SupportedProducts>
 			<IsolatedShell Version="6.1">AtmelStudio</IsolatedShell>
@@ -18,8 +18,13 @@
 
 		<SupportedFrameworkRuntimeEdition MinVersion="4.0" />
 		<Locale>1033</Locale>
+
+	    <AllUsers>true</AllUsers>
 	</Identifier>
 
 	<References/>
-	<Content/>
+
+	<Content>
+		<CustomExtension Type="asf-manifest">asf-manifest.xml</CustomExtension>
+	</Content>
 </Vsix>
diff --git a/LUFA/StudioIntegration/XSLT/lufa_asfmanifest_transform.xslt b/LUFA/StudioIntegration/XSLT/lufa_asfmanifest_transform.xslt
new file mode 100644
index 0000000000..8cbb8afb80
--- /dev/null
+++ b/LUFA/StudioIntegration/XSLT/lufa_asfmanifest_transform.xslt
@@ -0,0 +1,35 @@
+<!--
+             LUFA Library
+     Copyright (C) Dean Camera, 2013.
+
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+-->
+
+<!-- Atmel Studio framework VSIX XML transform file -->
+
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+	<xsl:output method="xml" omit-xml-declaration="yes"/>
+
+	<!-- Need to input the LUFA version for later use -->
+	<xsl:param name="lufa-version"/>
+
+	<!-- Recursively match and copy/process all nodes/attributes -->
+	<xsl:template match="@*|node()">
+		<xsl:copy>
+			<xsl:apply-templates select="@*|node()"/>
+		</xsl:copy>
+	</xsl:template>
+
+	<!-- Update the LUFA version to the version passed as a parameter -->
+	<xsl:template match="Version">
+		<xsl:copy>
+			<xsl:value-of select="substring($lufa-version, 1, 2)"/>
+			<xsl:text>.</xsl:text>
+			<xsl:value-of select="substring($lufa-version, 3, 2)"/>
+			<xsl:text>.</xsl:text>
+			<xsl:value-of select="substring($lufa-version, 5, 2)"/>
+		</xsl:copy>
+	</xsl:template>
+</xsl:stylesheet>
diff --git a/LUFA/StudioIntegration/makefile b/LUFA/StudioIntegration/makefile
index 860b5983db..2e7ae564ce 100644
--- a/LUFA/StudioIntegration/makefile
+++ b/LUFA/StudioIntegration/makefile
@@ -49,12 +49,19 @@ generate_xml: $(TEMP_MANIFEST_XML)
 	@rm $(TEMP_MANIFEST_XML)
 
 generate_vsix: $(EXTENSION_OUTPUT_XML) $(MODULE_OUTPUT_XML)
+	@echo "Archiving Content..."
+	@cd $(LUFA_ROOT)/../ && zip contents.zip -q -9 -r --exclude=*$(notdir $(DOXYGEN_TAG_FILE_XML)) --exclude=*StudioIntegration* LUFA Bootloaders Demos Projects extension.xml README.txt
+
 	@echo "Creating VSIX Dependencies..."
+	@cp $(LUFA_ROOT)/DoxygenPages/Images/LUFA_thumb.png $(LUFA_ROOT)/../PreviewThumb.png
+	@cp $(LUFA_ROOT)/DoxygenPages/Images/LUFA.png $(LUFA_ROOT)/../Preview.png
+	@cp $(LUFA_ROOT)/License.txt $(LUFA_ROOT)/../
 	@cp "VSIX/[Content_Types].xml" $(LUFA_ROOT)/../
 	@xsltproc --stringparam extension-version "$(EXT_VERSION_NUM)" XSLT/lufa_vsmanifest_transform.xslt VSIX/extension.vsixmanifest > $(LUFA_ROOT)/../extension.vsixmanifest
+	@xsltproc --stringparam lufa-version "$(LUFA_VERSION_NUM)" XSLT/lufa_asfmanifest_transform.xslt VSIX/asf-manifest.xml > $(LUFA_ROOT)/../asf-manifest.xml
 
 	@echo "Generating Atmel Studio VSIX Extension file..."
-	@cd $(LUFA_ROOT)/../ && zip LUFA_AS_Extension.vsix -q -9 -r --exclude=*$(notdir $(DOXYGEN_TAG_FILE_XML)) --exclude=*StudioIntegration* *
+	@cd $(LUFA_ROOT)/../ && zip LUFA.vsix -q contents.zip License.txt Preview.png PreviewThumb.png "[Content_Types].xml" extension.vsixmanifest asf-manifest.xml extension.xml
 	@echo "Atmel Studio VSIX Extension file generated."
 
 check_filenames: $(TEMP_MANIFEST_XML)