diff --git a/jtag/ChangeLog b/jtag/ChangeLog
index 1683b574..305b25c1 100644
--- a/jtag/ChangeLog
+++ b/jtag/ChangeLog
@@ -1,7 +1,9 @@
 2009-04-17  Kolja Waschk <kawk>
 
-  * src/flash/jedec.c: Add license info
+  * configure.ac: Last minute fix for USBCFLAGS for libusb
   * doc/UrJTAG.txt: Info about installing precompiled version on Win
+  * src/flash/jedec.c: Add license info
+  * UrJTAG.nsi: Create links to EXE and UrJTAG.txt in Start Menu
 
 2009-04-16  Arnim Laeuger  <arniml>
 
diff --git a/jtag/UrJTAG.nsi b/jtag/UrJTAG.nsi
index a209021c..6b5abb58 100644
--- a/jtag/UrJTAG.nsi
+++ b/jtag/UrJTAG.nsi
@@ -34,10 +34,14 @@
 ; the CFLAGS=-mno-cygwin setting. To make UrJTAG search for
 ; its data files and BSDL declarations in the correct path,
 ; add JTAG_BIN_DIR and JTAG_DATA_DIR as follows to the CFLAGS
+; on the same line together with ./configure and its options
 ; (this is used for building the UrJTAG.exe distributable):
 ;
 ;  CFLAGS="-mno-cygwin -O2 -DJTAG_BIN_DIR=\\\"/\\\" -DJTAG_DATA_DIR=\\\"/data\\\""
-;  ./configure --with-ftd2xx=/cygdrive/e/ftd2xx --with-inpout32 --enable-relocatable
+;  ./configure --enable-relocatable \
+;       --with-ftd2xx=/tmp/FTDI_CDM_204 \
+;       --with-libusb=/tmp/LibUSB-Win32_112 \
+;       --with-inpout32
 ;
 ; This script now expects InpOut32.dll in the current directory
 ; as well. You can get an InpOut32.dll that works on 32 bit AND
@@ -74,12 +78,24 @@
 
   !define MUI_ABORTWARNING
 
+;--------------------------------
+;Variables
+
+  Var StartMenuFolder
+
 ;--------------------------------
 ;Pages
 
   !insertmacro MUI_PAGE_LICENSE "COPYING"
   !insertmacro MUI_PAGE_COMPONENTS
   !insertmacro MUI_PAGE_DIRECTORY
+
+  ;Start Menu Folder Page Configuration
+  !define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKCU" 
+  !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\UrJTAG" 
+  !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
+  !insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder
+
   !insertmacro MUI_PAGE_INSTFILES
   
   !insertmacro MUI_UNPAGE_CONFIRM
@@ -112,7 +128,6 @@ Section "Documentation" SecDoc
 
 SectionEnd
 
-
 Section "Data files" SecData
 
   SetOutPath "$INSTDIR\data"
@@ -122,6 +137,19 @@ Section "Data files" SecData
 
 SectionEnd
 
+Section "Start Menu Entries" SecStartMenu
+
+ !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
+    ;Create shortcuts
+    CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
+    CreateShortCut "$SMPROGRAMS\$StartMenuFolder\JTAG Shell.lnk" "$INSTDIR\jtag.exe"
+    CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Documentation.lnk" "$INSTDIR\doc\UrJTAG.txt"
+    CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
+  !insertmacro MUI_STARTMENU_WRITE_END
+
+SectionEnd
+
+
 
 ;--------------------------------
 ;Descriptions
@@ -137,6 +165,9 @@ SectionEnd
   !insertmacro MUI_DESCRIPTION_TEXT ${SecData} \
     "BSDL include files and part descriptions for autodetection"
 
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecStartMenu} \
+    "Links to UrJTAG in Start Menu"
+
 !insertmacro MUI_FUNCTION_DESCRIPTION_END
 
 ;--------------------------------
@@ -149,6 +180,11 @@ Section "Uninstall"
   Delete "$INSTDIR\jtag.exe"
   Delete "$INSTDIR\uninst.exe"
   RMDir /r "$INSTDIR"
+
+  !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder
+  Delete "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk"
+  RMDir "$SMPROGRAMS\$StartMenuFolder"
+
   DeleteRegKey /ifempty HKCU "Software\UrJTAG"
 
 SectionEnd
diff --git a/jtag/configure.ac b/jtag/configure.ac
index 86baf0b1..a5b76d82 100644
--- a/jtag/configure.ac
+++ b/jtag/configure.ac
@@ -128,7 +128,7 @@ AS_IF([test "x$with_libusb" != xno], [
     case $host in
     *cygwin*)
       USBLIBS="-L$with_libusb/lib/gcc -lusb"
-      USBCLAGS="-I$with_libusb/include"
+      USBCFLAGS="-I$with_libusb/include"
       ;;
     *)
       USBLIBS="-Lwith_libusb -lusb"
diff --git a/jtag/src/flash/jedec.c b/jtag/src/flash/jedec.c
index ceb9bdc2..171f4f00 100644
--- a/jtag/src/flash/jedec.c
+++ b/jtag/src/flash/jedec.c
@@ -1,6 +1,23 @@
 /*
  * $Id$
  *
+ * Copyright (C) 2003 Matan Ziv-Av
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ *
  * Written by Matan Ziv-Av, 2003.
  *
  */