diff --git a/jtag/ChangeLog b/jtag/ChangeLog
index 397a17c3..0aee3e0f 100644
--- a/jtag/ChangeLog
+++ b/jtag/ChangeLog
@@ -1,3 +1,12 @@
+2008-07-03  Jie Zhang  <jie.zhang@analog.com>
+
+   * src/bsdl/bsdl.c: Remove trailing whitespaces.
+   * src/lib/make-relative-prefix.c: Likewise.
+   * src/lib/lbasename.c: Likewise.
+   * src/lib/lrealpath.c: Likewise.
+   * doc/UrJTAG.txt: Likewise.
+   * data/atmel/PARTS: Likewise.
+
 2008-07-02  Jie Zhang  <jie.zhang@analog.com>
 
    * include/bus_driver.h (struct bus_driver): Add driver argument
diff --git a/jtag/data/atmel/PARTS b/jtag/data/atmel/PARTS
index 38f80af5..d2077674 100644
--- a/jtag/data/atmel/PARTS
+++ b/jtag/data/atmel/PARTS
@@ -27,8 +27,8 @@
 #
 # [2] Atmel Corporation,  1504BSDL.ZIP - BSDL files for ATF1504AS/ASL and
 #     ATF1504ASV/ASVL
-# 
-# [3] Atmel Corporation, "AT32AP7000 - High Performance, Low Power 
+#
+# [3] Atmel Corporation, "AT32AP7000 - High Performance, Low Power
 #     AVR(R)32 32-Bit Microcontroller", Rev. 32003K-AVR32-10/07
 #
 
diff --git a/jtag/doc/UrJTAG.txt b/jtag/doc/UrJTAG.txt
index a4c55303..e4fdc84e 100644
--- a/jtag/doc/UrJTAG.txt
+++ b/jtag/doc/UrJTAG.txt
@@ -387,7 +387,7 @@ might give problems if the path contains spaces, as "Program Files" does!):
 
 UrJTAG may be compiled into a Windows executable using the MinGW compiler
 (http://www.mingw.org). This has the advantage over running in a Cygwin
-environment that you don't need to install anything else but the jtag.exe. 
+environment that you don't need to install anything else but the jtag.exe.
 However, because support for MinGW is quite new in UrJTAG, it may lack some
 features (e.g. readline support) or run a little slower.
 
diff --git a/jtag/src/bsdl/bsdl.c b/jtag/src/bsdl/bsdl.c
index ed9c399b..4688178d 100644
--- a/jtag/src/bsdl/bsdl.c
+++ b/jtag/src/bsdl/bsdl.c
@@ -201,7 +201,7 @@ void bsdl_set_path(chain_t *chain, const char *pathlist)
   char *pathelem;
   int num;
   size_t len;
-  
+
   /* free memory of current path list */
   if (globs->path_list) {
     for (num = 0; globs->path_list[num]; num++)
@@ -220,9 +220,9 @@ void bsdl_set_path(chain_t *chain, const char *pathlist)
       globs->path_list = (char **)realloc(globs->path_list, (num+1) * sizeof(char *));
       /* enter path element up to the delimeter */
       if (delim == NULL)
-      	len = strlen(elem);
+        len = strlen(elem);
       else
-      	len = delim-elem;
+        len = delim-elem;
       pathelem = malloc(len + 1);
       memcpy(pathelem, elem, len);
       pathelem[len] = '\0';
diff --git a/jtag/src/lib/lbasename.c b/jtag/src/lib/lbasename.c
index 56fcd625..423b16ac 100644
--- a/jtag/src/lib/lbasename.c
+++ b/jtag/src/lib/lbasename.c
@@ -52,7 +52,7 @@ lbasename (const char *name)
 
 #if defined (HAVE_DOS_BASED_FILE_SYSTEM)
   /* Skip over a possible disk name.  */
-  if (ISALPHA (name[0]) && name[1] == ':') 
+  if (ISALPHA (name[0]) && name[1] == ':')
     name += 2;
 #endif
 
diff --git a/jtag/src/lib/lrealpath.c b/jtag/src/lib/lrealpath.c
index b27c8de9..a03afe8c 100644
--- a/jtag/src/lib/lrealpath.c
+++ b/jtag/src/lib/lrealpath.c
@@ -65,7 +65,7 @@ extern char *canonicalize_file_name (const char *);
 #  endif
 # endif
 #else
-  /* cygwin has realpath, so it won't get here.  */ 
+  /* cygwin has realpath, so it won't get here.  */
 # if defined (_WIN32)
 #  define WIN32_LEAN_AND_MEAN
 #  include <windows.h> /* for GetFullPathName */
diff --git a/jtag/src/lib/make-relative-prefix.c b/jtag/src/lib/make-relative-prefix.c
index 80e7f92f..fd540867 100644
--- a/jtag/src/lib/make-relative-prefix.c
+++ b/jtag/src/lib/make-relative-prefix.c
@@ -78,7 +78,7 @@ relative prefix can be found, return @code{NULL}.
 #  define HAVE_DOS_BASED_FILE_SYSTEM
 #  define HAVE_HOST_EXECUTABLE_SUFFIX
 #  define HOST_EXECUTABLE_SUFFIX ".exe"
-#  ifndef DIR_SEPARATOR_2 
+#  ifndef DIR_SEPARATOR_2
 #    define DIR_SEPARATOR_2 '\\'
 #  endif
 #  define PATH_SEPARATOR ';'