diff --git a/LUFA.pnproj b/LUFA.pnproj
index 40b4a18666..8b30791535 100644
--- a/LUFA.pnproj
+++ b/LUFA.pnproj
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index 41e82ea0c0..52c78f0015 100644
--- a/LUFA/ManPages/ChangeLog.txt
+++ b/LUFA/ManPages/ChangeLog.txt
@@ -15,6 +15,7 @@
*
* Changed:
* - Slowed down bit-banged PDI programming in the AVRISP project slightly to prevent transmission errors
+ * - Renamed the AVRISP project folder to AVRISP-MKII to reduce confusion
*
* Fixed:
* - Fixed AVRISP project not able to enter programming mode when ISP protocol is used
diff --git a/LUFA/ManPages/LibraryApps.txt b/LUFA/ManPages/LibraryApps.txt
index 28ece38b85..0ea01c7dce 100644
--- a/LUFA/ManPages/LibraryApps.txt
+++ b/LUFA/ManPages/LibraryApps.txt
@@ -98,7 +98,7 @@
* - CDC - CDC Class USB bootloader, compatible with any AVR910 protocol programming software such as AVRDude
* - TeensyHID - HID Class bootloader, compatible with the PJRC TeensyLoader software
* - Projects
- * - AVRISP - AVRISP-MKII Programmer Clone project
+ * - AVRISP-MKII - AVRISP-MKII Programmer Clone project
* - Benito - Benito Board Arduino Programmer project
* - LEDNotifier - USB LED Notification project
* - Magstripe - Magnetic Stripe Card Reader project
diff --git a/LUFA/ManPages/MainPage.txt b/LUFA/ManPages/MainPage.txt
index 8fe197f16a..242ffd751f 100644
--- a/LUFA/ManPages/MainPage.txt
+++ b/LUFA/ManPages/MainPage.txt
@@ -11,7 +11,7 @@
* \image html LUFA.gif
* \n
*
- * For author and donation information, see \ref Page_Donating.
+ * LUFA is donationware. For author and donation information, see \ref Page_Donating.
*
* LUFA is an open-source USB library for the USB-enabled AVR microcontrollers, released under the MIT license. It supports
* a large number of USB AVR models and boards (see \ref Page_DeviceSupport). It is designed to provide an easy to use, feature
diff --git a/Projects/AVRISP-MKII/Doxygen.conf b/Projects/AVRISP-MKII/Doxygen.conf
index eb8a1ab4c2..de266e4d6f 100644
--- a/Projects/AVRISP-MKII/Doxygen.conf
+++ b/Projects/AVRISP-MKII/Doxygen.conf
@@ -25,7 +25,7 @@ DOXYFILE_ENCODING = UTF-8
# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
# by quotes) that should identify the project.
-PROJECT_NAME = "AVRISP MKII Programmer Project"
+PROJECT_NAME = "AVRISP-MKII Clone Programmer Project"
# The PROJECT_NUMBER tag can be used to enter a project or revision number.
# This could be handy for archiving the generated documentation or
diff --git a/Projects/makefile b/Projects/makefile
index 27a18c1372..578e5217a7 100644
--- a/Projects/makefile
+++ b/Projects/makefile
@@ -14,8 +14,8 @@
# code.
all:
- make -C AVRISP clean
- make -C AVRISP all
+ make -C AVRISP-MKII clean
+ make -C AVRISP-MKII all
make -C Benito clean
make -C Benito all
@@ -36,7 +36,7 @@ all:
make -C XPLAINBridge all
%:
- make -C AVRISP $@
+ make -C AVRISP-MKII $@
make -C Benito $@
make -C LEDNotifier $@
make -C Magstripe $@