diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp
index 144872942..5673a6c8f 100644
--- a/cli/cmdlineparser.cpp
+++ b/cli/cmdlineparser.cpp
@@ -1130,6 +1130,10 @@ void CmdLineParser::printHelp()
" 8 bit AVR microcontrollers\n"
" * pic8\n"
" 8 bit PIC microcontrollers\n"
+ " Baseline and mid-range architectures\n"
+ " * pic8-enhanced\n"
+ " 8 bit PIC microcontrollers\n"
+ " Enhanced mid-range and high end (PIC18) architectures\n"
" * pic16\n"
" 16 bit PIC microcontrollers\n"
" * mips32\n"
diff --git a/platforms/pic8-enhanced.xml b/platforms/pic8-enhanced.xml
new file mode 100644
index 000000000..a5cd45e35
--- /dev/null
+++ b/platforms/pic8-enhanced.xml
@@ -0,0 +1,18 @@
+
+
+ 8
+ unsigned
+
+ 1
+ 2
+ 2
+ 4
+ 8
+ 4
+ 4
+ 4
+ 2
+ 2
+ 2
+
+
diff --git a/win_installer/cppcheck.wxs b/win_installer/cppcheck.wxs
index f7c958344..86004bae1 100644
--- a/win_installer/cppcheck.wxs
+++ b/win_installer/cppcheck.wxs
@@ -133,6 +133,7 @@
+