diff --git a/COPYING.LGPL b/COPYING.LGPL
index 5c879e45..9623417f 100644
--- a/COPYING.LGPL
+++ b/COPYING.LGPL
@@ -133,7 +133,7 @@ such a program is covered only if its contents constitute a work based
 on the Library (independent of the use of the Library in a tool for
 writing it).  Whether that is true depends on what the Library does
 and what the program that uses the Library does.
-  
+
   1. You may copy and distribute verbatim copies of the Library's
 complete source code as you receive it, in any medium, provided that
 you conspicuously and appropriately publish on each copy an
diff --git a/README b/README
index 667d528f..07a4c5cb 100644
--- a/README
+++ b/README
@@ -22,7 +22,7 @@ codec developed by Josh Coalson.
 
 FLAC is comprised of 1) `libFLAC', a library which implements
 reference encoders and decoders, licensed under the GNU Lesser
-General Public License (LGPL); 2) `flac', a command-line program for 
+General Public License (LGPL); 2) `flac', a command-line program for
 encoding and decoding files, licensed under the GNU General public
 License (GPL); 3) `metaflac', a command-line program for editing
 FLAC metadata, licensed under the GPL; 4) player plugins for XMMS
diff --git a/man/flac.sgml b/man/flac.sgml
index 8b19fe4e..e120f093 100644
--- a/man/flac.sgml
+++ b/man/flac.sgml
@@ -257,25 +257,25 @@
 		  <variablelist>
 		    <varlistentry>
 		      <term><option>-0</option></term>
-		      
+
 		      <listitem>
 			<para>Synonymous with -l 0 -b 1152 -r 2,2
 			  </para>
 		      </listitem>
 		    </varlistentry>
-		    
+
 		    <varlistentry>
 		      <term><option>-1</option></term>
-		      
+
 		      <listitem>
 			<para>Synonymous with -l 0 -b 1152 -M -r 2,2
 			  </para>
 		      </listitem>
 		    </varlistentry>
-		    
+
 		    <varlistentry>
 		      <term><option>-2</option></term>
-		      
+
 		      <listitem>
 			<para>Synonymous with -l 0 -b 1152 -m -r 3
 			  </para>
@@ -284,25 +284,25 @@
 
 		    <varlistentry>
 		      <term><option>-3</option></term>
-		      
+
 		      <listitem>
 			<para>Synonymous with -l 6 -b 4608 -r 3,3
 			  </para>
 		      </listitem>
 		    </varlistentry>
-		    
+
 		    <varlistentry>
 		      <term><option>-4</option></term>
-		      
+
 		      <listitem>
 			<para>Synonymous with -l 8 -b 4608 -M -r 3,3
 			  </para>
 		      </listitem>
 		    </varlistentry>
-		    
+
 		    <varlistentry>
 		      <term><option>-5</option></term>
-		      
+
 		      <listitem>
 			<para>Synonymous with -l 8 -b 4608 -m -r 3,3
 			  </para>
@@ -311,16 +311,16 @@
 
 		    <varlistentry>
 		      <term><option>-6</option></term>
-		      
+
 		      <listitem>
 			<para>Synonymous with -l 8 -b 4608 -m -r 4
 			  </para>
 		      </listitem>
 		    </varlistentry>
-		    
+
 		    <varlistentry>
 		      <term><option>-7</option></term>
-		      
+
 		      <listitem>
 			<para>Synonymous with -l 8 -b 4608 -m -e -r 6
 			  </para>
@@ -338,14 +338,14 @@
 
 		    <varlistentry>
 		      <term><option>-9</option></term>
-		      
+
 		      <listitem>
 			<para>Synonymous with -l 32 -b 4608 -m -e -r 16 -p
 			  (very slow!)</para>
 		      </listitem>
 		    </varlistentry>
 		  </variablelist>
-		  
+
 		</listitem>
 
 
diff --git a/src/libFLAC/Makefile.am b/src/libFLAC/Makefile.am
index b4566bc8..8c06afab 100644
--- a/src/libFLAC/Makefile.am
+++ b/src/libFLAC/Makefile.am
@@ -29,7 +29,7 @@ endif
 
 if FLaC__NO_ASM
 else
-if FLaC__CPU_IA32 
+if FLaC__CPU_IA32
 if FLaC__HAS_NASM
 SUBDIRS = ia32 .
 libFLAC_la_LIBADD = ia32/libFLAC-asm.la
diff --git a/src/libFLAC/ia32/lpc_asm.nasm b/src/libFLAC/ia32/lpc_asm.nasm
index de2d1ff1..6e5667c1 100644
--- a/src/libFLAC/ia32/lpc_asm.nasm
+++ b/src/libFLAC/ia32/lpc_asm.nasm
@@ -905,7 +905,7 @@ cident FLAC__lpc_compute_residual_from_qlp_coefficients_asm_ia32_mmx
 	sub	ebx, 2
 	jg	.mmx_4_loop_i
 	jmp	.mmx_end
-	
+
 .mmx_4more:
 	shl	eax, 2
 	neg	eax
diff --git a/src/test_streams/Makefile.am b/src/test_streams/Makefile.am
index 2dc3b74d..6dfa8eb1 100644
--- a/src/test_streams/Makefile.am
+++ b/src/test_streams/Makefile.am
@@ -1,16 +1,16 @@
 #  test_streams - Simple test pattern generator
 #  Copyright (C) 2000,2001  Josh Coalson
-# 
+#
 #  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.
diff --git a/src/test_streams/Makefile.lite b/src/test_streams/Makefile.lite
index cd71eb1c..24401a28 100644
--- a/src/test_streams/Makefile.lite
+++ b/src/test_streams/Makefile.lite
@@ -1,16 +1,16 @@
 #  test_streams - Simple test pattern generator
 #  Copyright (C) 2000,2001  Josh Coalson
-# 
+#
 #  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.