diff --git a/Bootloaders/CDC/LUFA CDC Bootloader.inf b/Bootloaders/CDC/LUFA CDC Bootloader.inf
index 80b8d69bc8522eae6d053ea311b25f4659887f95..1dd7471d3c3cfc5a94e5aabbf497d2f96907c2a6 100644
--- a/Bootloaders/CDC/LUFA CDC Bootloader.inf	
+++ b/Bootloaders/CDC/LUFA CDC Bootloader.inf	
@@ -100,7 +100,7 @@ ServiceBinary=%12%\%DRIVERFILENAME%.sys
 [Strings]
 MFGFILENAME="CDC_vista"
 DRIVERFILENAME ="usbser"
-MFGNAME="CCS, Inc."
+MFGNAME="http://www.fourwalledcubicle.com"
 INSTDISK="LUFA CDC Bootloader Driver Installer"
 DESCRIPTION="Communications Port"
 SERVICE="USB RS-232 Emulation Driver"
\ No newline at end of file
diff --git a/Demos/Device/ClassDriver/DualVirtualSerial/LUFA DualVirtualSerial.inf b/Demos/Device/ClassDriver/DualVirtualSerial/LUFA DualVirtualSerial.inf
index 741bf28eb77f070dcef13bfb4bcd30f563b4e755..beb62c644a2ec69efcd53becce751a8601d08ad7 100644
--- a/Demos/Device/ClassDriver/DualVirtualSerial/LUFA DualVirtualSerial.inf	
+++ b/Demos/Device/ClassDriver/DualVirtualSerial/LUFA DualVirtualSerial.inf	
@@ -100,7 +100,7 @@ ServiceBinary=%12%\%DRIVERFILENAME%.sys
 [Strings]
 MFGFILENAME="CDC_vista"
 DRIVERFILENAME ="usbser"
-MFGNAME="CCS, Inc."
+MFGNAME="http://www.fourwalledcubicle.com"
 INSTDISK="LUFA Dual CDC Driver Installer"
 DESCRIPTION="Communications Port"
 SERVICE="USB RS-232 Emulation Driver"
\ No newline at end of file
diff --git a/Demos/Device/ClassDriver/VirtualSerial/LUFA VirtualSerial.inf b/Demos/Device/ClassDriver/VirtualSerial/LUFA VirtualSerial.inf
index 4cdf594351a8816855c380b02b9dbb2c426b1a6a..a179053ebc914290c17f0dc40be94c97d29b6b3b 100644
--- a/Demos/Device/ClassDriver/VirtualSerial/LUFA VirtualSerial.inf	
+++ b/Demos/Device/ClassDriver/VirtualSerial/LUFA VirtualSerial.inf	
@@ -100,7 +100,7 @@ ServiceBinary=%12%\%DRIVERFILENAME%.sys
 [Strings]
 MFGFILENAME="CDC_vista"
 DRIVERFILENAME ="usbser"
-MFGNAME="CCS, Inc."
+MFGNAME="http://www.fourwalledcubicle.com"
 INSTDISK="LUFA CDC Driver Installer"
 DESCRIPTION="Communications Port"
 SERVICE="USB RS-232 Emulation Driver"
\ No newline at end of file
diff --git a/Demos/Device/ClassDriver/VirtualSerialMouse/LUFA VirtualSerialMouse.inf b/Demos/Device/ClassDriver/VirtualSerialMouse/LUFA VirtualSerialMouse.inf
index f15c93c2fce3ee02af85aa452b1d011ab8a943fb..0bd268a27b329d86a769650cfd7236efc254166b 100644
--- a/Demos/Device/ClassDriver/VirtualSerialMouse/LUFA VirtualSerialMouse.inf	
+++ b/Demos/Device/ClassDriver/VirtualSerialMouse/LUFA VirtualSerialMouse.inf	
@@ -100,7 +100,7 @@ ServiceBinary=%12%\%DRIVERFILENAME%.sys
 [Strings]
 MFGFILENAME="CDC_vista"
 DRIVERFILENAME ="usbser"
-MFGNAME="CCS, Inc."
+MFGNAME="http://www.fourwalledcubicle.com"
 INSTDISK="LUFA CDC/Mouse Driver Installer"
 DESCRIPTION="Communications Port"
 SERVICE="USB RS-232 Emulation Driver"
\ No newline at end of file
diff --git a/Demos/Device/LowLevel/DualVirtualSerial/LUFA DualVirtualSerial.inf b/Demos/Device/LowLevel/DualVirtualSerial/LUFA DualVirtualSerial.inf
index 741bf28eb77f070dcef13bfb4bcd30f563b4e755..beb62c644a2ec69efcd53becce751a8601d08ad7 100644
--- a/Demos/Device/LowLevel/DualVirtualSerial/LUFA DualVirtualSerial.inf	
+++ b/Demos/Device/LowLevel/DualVirtualSerial/LUFA DualVirtualSerial.inf	
@@ -100,7 +100,7 @@ ServiceBinary=%12%\%DRIVERFILENAME%.sys
 [Strings]
 MFGFILENAME="CDC_vista"
 DRIVERFILENAME ="usbser"
-MFGNAME="CCS, Inc."
+MFGNAME="http://www.fourwalledcubicle.com"
 INSTDISK="LUFA Dual CDC Driver Installer"
 DESCRIPTION="Communications Port"
 SERVICE="USB RS-232 Emulation Driver"
\ No newline at end of file
diff --git a/Demos/Device/LowLevel/VirtualSerial/LUFA VirtualSerial.inf b/Demos/Device/LowLevel/VirtualSerial/LUFA VirtualSerial.inf
index 4cdf594351a8816855c380b02b9dbb2c426b1a6a..a179053ebc914290c17f0dc40be94c97d29b6b3b 100644
--- a/Demos/Device/LowLevel/VirtualSerial/LUFA VirtualSerial.inf	
+++ b/Demos/Device/LowLevel/VirtualSerial/LUFA VirtualSerial.inf	
@@ -100,7 +100,7 @@ ServiceBinary=%12%\%DRIVERFILENAME%.sys
 [Strings]
 MFGFILENAME="CDC_vista"
 DRIVERFILENAME ="usbser"
-MFGNAME="CCS, Inc."
+MFGNAME="http://www.fourwalledcubicle.com"
 INSTDISK="LUFA CDC Driver Installer"
 DESCRIPTION="Communications Port"
 SERVICE="USB RS-232 Emulation Driver"
\ No newline at end of file
diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index 8104bc20d756753d57c79c620ef53809d85a16d6..9c4e5dcc3c5de3fd7885d4f0aa74b313b7b40849 100644
--- a/LUFA/ManPages/ChangeLog.txt
+++ b/LUFA/ManPages/ChangeLog.txt
@@ -9,7 +9,7 @@
   *  \section Sec_ChangeLogXXXXXX Version XXXXXX
   *
   *  <b>New:</b>
-  *  - Added TPI programming support for 6-pin ATTINY to the AVRISP programmer project
+  *  - Added TPI programming support for 6-pin ATTINY devices to the AVRISP programmer project
   *  - Added command timeout counter to the AVRISP project so that the device no longer freezes when incorrectly connected
   *    to a target
   *  - Added new TemperatureDataLogger application, a USB data logger which writes to the device's dataflash and appears to
diff --git a/LUFA/ManPages/FutureChanges.txt b/LUFA/ManPages/FutureChanges.txt
index dc8c27b1e6428c6ed8a39456400b311cef9521c9..38cbf0ccf3dfd4e01ec770e837f49ba60eb06489 100644
--- a/LUFA/ManPages/FutureChanges.txt
+++ b/LUFA/ManPages/FutureChanges.txt
@@ -17,7 +17,6 @@
   *      -# Add ability to get number of bytes not written with pipe/endpoint write routines after an error
   *      -# Add standardized descriptor names to class driver structures
   *      -# Correct mishandling of error cases in Mass Storage demos
-  *      -# TEST AND CORRECT TPI PROGRAMMING SUPPORT IN THE AVRISP-MKII PROJECT (BLOCKING)
   *  - Documentation/Support
   *      -# Remake AVRStudio project files
   *      -# Add detailed overviews of how each demo works
diff --git a/Projects/Benito/Benito Programmer.inf b/Projects/Benito/Benito Programmer.inf
index 6af572527b1d5278c0ffafbc87d88de373f5565f..d819ec0d593a676f3eaa1948ae3d2128a85f39e3 100644
--- a/Projects/Benito/Benito Programmer.inf	
+++ b/Projects/Benito/Benito Programmer.inf	
@@ -100,7 +100,7 @@ ServiceBinary=%12%\%DRIVERFILENAME%.sys
 [Strings]
 MFGFILENAME="CDC_vista"
 DRIVERFILENAME ="usbser"
-MFGNAME="CCS, Inc."
+MFGNAME="http://www.fourwalledcubicle.com"
 INSTDISK="LUFA Benito Programmer Driver Installer"
 DESCRIPTION="Communications Port"
 SERVICE="USB RS-232 Emulation Driver"
\ No newline at end of file
diff --git a/Projects/LEDNotifier/LUFA LED Notifier.inf b/Projects/LEDNotifier/LUFA LED Notifier.inf
index 4cdf594351a8816855c380b02b9dbb2c426b1a6a..a179053ebc914290c17f0dc40be94c97d29b6b3b 100644
--- a/Projects/LEDNotifier/LUFA LED Notifier.inf	
+++ b/Projects/LEDNotifier/LUFA LED Notifier.inf	
@@ -100,7 +100,7 @@ ServiceBinary=%12%\%DRIVERFILENAME%.sys
 [Strings]
 MFGFILENAME="CDC_vista"
 DRIVERFILENAME ="usbser"
-MFGNAME="CCS, Inc."
+MFGNAME="http://www.fourwalledcubicle.com"
 INSTDISK="LUFA CDC Driver Installer"
 DESCRIPTION="Communications Port"
 SERVICE="USB RS-232 Emulation Driver"
\ No newline at end of file
diff --git a/Projects/USBtoSerial/LUFA USBtoSerial.inf b/Projects/USBtoSerial/LUFA USBtoSerial.inf
index 10a6a8ce28c9dc7fa4c4575646ac0d2fefa90dfb..9a0a0e418398c85032d18fe9c00099b616a16eee 100644
--- a/Projects/USBtoSerial/LUFA USBtoSerial.inf	
+++ b/Projects/USBtoSerial/LUFA USBtoSerial.inf	
@@ -100,7 +100,7 @@ ServiceBinary=%12%\%DRIVERFILENAME%.sys
 [Strings]
 MFGFILENAME="CDC_vista"
 DRIVERFILENAME ="usbser"
-MFGNAME="CCS, Inc."
+MFGNAME="http://www.fourwalledcubicle.com"
 INSTDISK="LUFA USB-RS232 CDC Driver Installer"
 DESCRIPTION="Communications Port"
 SERVICE="USB RS-232 Emulation Driver"
\ No newline at end of file
diff --git a/Projects/XPLAINBridge/LUFA XPLAIN Bridge.inf b/Projects/XPLAINBridge/LUFA XPLAIN Bridge.inf
index 10a6a8ce28c9dc7fa4c4575646ac0d2fefa90dfb..9a0a0e418398c85032d18fe9c00099b616a16eee 100644
--- a/Projects/XPLAINBridge/LUFA XPLAIN Bridge.inf	
+++ b/Projects/XPLAINBridge/LUFA XPLAIN Bridge.inf	
@@ -100,7 +100,7 @@ ServiceBinary=%12%\%DRIVERFILENAME%.sys
 [Strings]
 MFGFILENAME="CDC_vista"
 DRIVERFILENAME ="usbser"
-MFGNAME="CCS, Inc."
+MFGNAME="http://www.fourwalledcubicle.com"
 INSTDISK="LUFA USB-RS232 CDC Driver Installer"
 DESCRIPTION="Communications Port"
 SERVICE="USB RS-232 Emulation Driver"
\ No newline at end of file