diff --git a/CHANGELIST b/CHANGELIST
index b6d0b66359..02e69971c8 100644
--- a/CHANGELIST
+++ b/CHANGELIST
@@ -22,6 +22,6 @@
     Example:
       --python-bin=/usr/bin/python2.7
       --python-easyinstall=/usr/bin/easy_install2.7
-    
+
 0.2.26 and earlier
   No changelist tracked. My bad, yo.
diff --git a/NOTES.md b/NOTES.md
index 2b0c8907a8..8ed4285372 100644
--- a/NOTES.md
+++ b/NOTES.md
@@ -48,6 +48,6 @@ packages with fpm in debian. It will likely require a one-time addition to
 site.py (/usr/lib/python2.6/site.py) or some other PYTHONPATH hackery, though
 I don't know just yet.
 
-It will also require special setup.py invocations as Debian has patched distutils to 
+It will also require special setup.py invocations as Debian has patched distutils to
 install python packages, by default, to a place that requires again the
 python-central/support tools to run to make them work.
diff --git a/bin/fpm-npm b/bin/fpm-npm
index 6793de0bf8..8ee226554a 100755
--- a/bin/fpm-npm
+++ b/bin/fpm-npm
@@ -61,8 +61,8 @@ Dir.glob("#{builddir}/usr/lib/node/.npm/*/*") do |path|
   # So we'll specify deps of {v}-1 <= x <= {v}-999999....
   depends = Dir.glob("#{path}/dependson/*@*") \
     .collect { |p| PACKAGEPREFIX + File.basename(p) } \
-    .collect { |p| n,v = p.split("@"); 
-      ["#{n} (>= #{v}-1)", "#{n} (<= #{v}-99999999999999)"] 
+    .collect { |p| n,v = p.split("@");
+      ["#{n} (>= #{v}-1)", "#{n} (<= #{v}-99999999999999)"]
   }.flatten
 
   if package["author"]
@@ -73,7 +73,7 @@ Dir.glob("#{builddir}/usr/lib/node/.npm/*/*") do |path|
     maintainer = "#{m["name"]} <#{m["email"]}>"
   end
 
-  pkgcmd = [ "fpm", 
+  pkgcmd = [ "fpm",
     "-n", "#{PACKAGEPREFIX}#{package["name"]}",
     "-v", package["version"],
     "-m", maintainer,
diff --git a/examples/fpm/README.md b/examples/fpm/README.md
index 799a94a4fb..72430a9897 100644
--- a/examples/fpm/README.md
+++ b/examples/fpm/README.md
@@ -16,4 +16,4 @@ Should make the package. Try installing:
 
 Now try it:
 
-    $ /opt/fpm/bin/fpm --help 
+    $ /opt/fpm/bin/fpm --help
diff --git a/examples/jruby/README.md b/examples/jruby/README.md
index a0819b3d5a..059b8f6adb 100644
--- a/examples/jruby/README.md
+++ b/examples/jruby/README.md
@@ -8,7 +8,7 @@ Should make the package. Try installing:
 
 Now try it:
 
-    % /opt/jruby/bin/jirb 
+    % /opt/jruby/bin/jirb
     >> require "java"
     => true
     >> java.lang.System.out.println("Hello")
diff --git a/examples/python/twisted/Makefile b/examples/python/twisted/Makefile
index d8b7257165..38ef3d115d 100644
--- a/examples/python/twisted/Makefile
+++ b/examples/python/twisted/Makefile
@@ -8,7 +8,7 @@ usr: twisted
 	cd twisted; python setup.py bdist
 	tar -zxf twisted/dist/Twisted-$(VERSION).linux-$(shell uname -m).tar.gz
 
-package: usr 
+package: usr
 	fpm -s dir -t deb -n $(NAME) -v $(VERSION) \
 		-p python-$(NAME)-VERSION_ARCH.deb -d "python" \
 		usr
diff --git a/lib/fpm/builder.rb b/lib/fpm/builder.rb
index f445e33ebf..002a0fc96f 100644
--- a/lib/fpm/builder.rb
+++ b/lib/fpm/builder.rb
@@ -55,7 +55,7 @@ def initialize(settings, paths=[])
     @edit = !!settings.edit
 
     @paths = paths
-    @package = package_class_for(settings.package_type).new(@source, 
+    @package = package_class_for(settings.package_type).new(@source,
 			:settings => settings.target
 		)
     # Append dependencies given from settings (-d flag for fpm)
diff --git a/lib/fpm/flags.rb b/lib/fpm/flags.rb
index 20814bbfd9..94c8961523 100644
--- a/lib/fpm/flags.rb
+++ b/lib/fpm/flags.rb
@@ -10,7 +10,7 @@ def initialize(opts, flag_prefix, help_prefix)
   def on(*args, &block)
     fixed_args = args.collect do |arg|
       if arg =~ /^--/
-        "--#{@flag_prefix}-#{arg.gsub(/^--/, "")}" 
+        "--#{@flag_prefix}-#{arg.gsub(/^--/, "")}"
       else
         "(#{@help_prefix}) #{arg}"
       end
diff --git a/lib/fpm/package.rb b/lib/fpm/package.rb
index 93aa219249..59daba86c6 100644
--- a/lib/fpm/package.rb
+++ b/lib/fpm/package.rb
@@ -158,7 +158,7 @@ def default_output
   end # def default_output
 
   def fixpath(path)
-    if path[0,1] != "/" 
+    if path[0,1] != "/"
       path = File.join(@source.root, path)
     end
     return path if File.symlink?(path)
diff --git a/lib/fpm/program.rb b/lib/fpm/program.rb
index 10ae176de6..43247d9a8f 100644
--- a/lib/fpm/program.rb
+++ b/lib/fpm/program.rb
@@ -109,7 +109,7 @@ def default_options(opts)
 
     opts.on("-v VERSION", "--version VERSION",
             "version to give the package") do |version|
-      @settings.version = version 
+      @settings.version = version
     end # --version
 
     opts.on("--iteration ITERATION",
@@ -152,7 +152,7 @@ def default_options(opts)
 
     opts.on("-s SOURCE_TYPE", "what to build the package from") do |st|
       @settings.source_type = st
-    end # -s 
+    end # -s
 
     opts.on("-S PACKAGE_SUFFIX", "which suffix to append to package and dependencies") do |sfx|
       @settings.suffix = sfx
diff --git a/lib/fpm/source.rb b/lib/fpm/source.rb
index 825198b257..50e6e78da5 100644
--- a/lib/fpm/source.rb
+++ b/lib/fpm/source.rb
@@ -87,11 +87,11 @@ def tar(output, paths, chdir=".")
     paths = [ paths ] if paths.is_a? String
     paths.each do |path|
       while path != "/" and path != "."
-        dirs << path if !dirs.include?(path) 
+        dirs << path if !dirs.include?(path)
         path = File.dirname(path)
       end
     end # paths.each
-    
+
     # Want directories to be sorted thusly: [ "/usr", "/usr/bin" ]
     # Why? tar and some package managers sometimes fail if the tar is created
     # like: [ "/opt/fizz", "/opt" ]
@@ -136,7 +136,7 @@ def tar(output, paths, chdir=".")
     end
   end # def tar
 
-  def tar_cmd 
+  def tar_cmd
     # Rely on gnu tar for solaris.
     case %x{uname -s}.chomp
     when "SunOS"
diff --git a/lib/fpm/source/dir.rb b/lib/fpm/source/dir.rb
index ef9d7faa37..54adb58aee 100644
--- a/lib/fpm/source/dir.rb
+++ b/lib/fpm/source/dir.rb
@@ -16,7 +16,7 @@ def make_tarball!(tar_path, builddir)
       @paths.each do |path|
         # Trim @root (--chdir)
         if @root != "." and path.start_with?(@root)
-          path = path[@root.size .. -1] 
+          path = path[@root.size .. -1]
         end
 
         # Copy to self[:prefix] (aka --prefix)
diff --git a/lib/fpm/source/pyfpm/get_metadata.py b/lib/fpm/source/pyfpm/get_metadata.py
index 5dcc03dd6b..da7998c170 100644
--- a/lib/fpm/source/pyfpm/get_metadata.py
+++ b/lib/fpm/source/pyfpm/get_metadata.py
@@ -50,7 +50,7 @@ def run(self):
       dependencies = self.distribution.install_requires
     except:
       pass
-    
+
     # In some cases (Mysql-Python) 'dependencies' is none, not empty.
     if dependencies is None:
       dependencies = []
diff --git a/lib/fpm/source/python.rb b/lib/fpm/source/python.rb
index e090e0aebf..630f38964c 100644
--- a/lib/fpm/source/python.rb
+++ b/lib/fpm/source/python.rb
@@ -30,7 +30,7 @@ def get_source(params)
       return
     end
 
-    if !File.exists?(package) 
+    if !File.exists?(package)
       download(package, params[:version])
     else
       @paths = [ File.expand_path(package) ]
diff --git a/lib/fpm/target/deb.rb b/lib/fpm/target/deb.rb
index 6cfa840544..9e068ff99d 100644
--- a/lib/fpm/target/deb.rb
+++ b/lib/fpm/target/deb.rb
@@ -115,7 +115,7 @@ def fix_dependency(dep)
     end
 
     name_re = /^[^ \(]+/
-    name = dep[name_re] 
+    name = dep[name_re]
     if name =~ /[A-Z]/
       @logger.warn("Downcasing dependency '#{name}' because deb packages " \
                    " don't work so good with uppercase names")
diff --git a/lib/fpm/target/puppet.rb b/lib/fpm/target/puppet.rb
index 8c31ad5d75..da22e78ed2 100644
--- a/lib/fpm/target/puppet.rb
+++ b/lib/fpm/target/puppet.rb
@@ -36,7 +36,7 @@ def generate_specfile(builddir)
       dir = File.join(builddir, "manifests", File.dirname(manifest))
       @logger.info("manifests targeting: #{dir}")
       ::Dir.mkdir(dir) if !File.directory?(dir)
-      
+
       File.open(File.join(builddir, "manifests", manifest), "w") do |f|
         @logger.info("manifest: #{f.path}")
         template = template(File.join("puppet", "#{manifest}.erb"))
diff --git a/lib/fpm/target/rpm.rb b/lib/fpm/target/rpm.rb
index 3b6dae4b23..a121963cad 100644
--- a/lib/fpm/target/rpm.rb
+++ b/lib/fpm/target/rpm.rb
@@ -10,7 +10,7 @@ def architecture
       when "all"
         # Translate fpm "all" arch to what it means in RPM.
         return "noarch"
-      else 
+      else
         return @architecture
     end
   end # def architecture
@@ -30,7 +30,7 @@ def build!(params)
     end
 
     %w(BUILD RPMS SRPMS SOURCES SPECS).each { |d| Dir.mkdir(d) }
-    args = ["rpmbuild", "-ba", 
+    args = ["rpmbuild", "-ba",
            "--define", "buildroot #{Dir.pwd}/BUILD",
            "--define", "_topdir #{Dir.pwd}",
            "--define", "_sourcedir #{Dir.pwd}",
diff --git a/lib/fpm/target/solaris.rb b/lib/fpm/target/solaris.rb
index 4e70033a56..020a44842d 100644
--- a/lib/fpm/target/solaris.rb
+++ b/lib/fpm/target/solaris.rb
@@ -11,7 +11,7 @@ def architecture
     when nil, "native"
       @architecture = %x{uname -p}.chomp
     end
-    # "all" is a valid arch according to 
+    # "all" is a valid arch according to
     # http://www.bolthole.com/solaris/makeapackage.html
 
     return @architecture
diff --git a/lib/rpm/header.rb b/lib/rpm/header.rb
index 4b39a45be9..c3223e2336 100644
--- a/lib/rpm/header.rb
+++ b/lib/rpm/header.rb
@@ -23,11 +23,11 @@ def read
     # At this point assume we've read and consumed the lead and signature.
     #len = @rpm.signature.index_length + @rpm.signature
     #
-    # header size is 
+    # header size is
     #     ( @rpm.signature.index_length * size of a header entry )
     #     + @rpm.signature.data_length
     #
-    # header 'entries' are an 
+    # header 'entries' are an
     #   int32 (tag id), int32 (tag type), int32  (offset), uint32 (count)
     #
     # See rpm's header.c, the headerLoad method function for reference.
@@ -43,7 +43,7 @@ def read
     @index_size = @index_count * entry_size
     tag_data = @rpm.file.read(@index_size)
     data = @rpm.file.read(@data_length)
-    
+
     #ap :data => data
 
     (0 ... @index_count).each do |i|
@@ -55,7 +55,7 @@ def read
       @tags << tag
 
       #ap tag.tag => {
-        #:type => tag.type, 
+        #:type => tag.type,
         #:offset => tag.offset,
         #:count => tag.count,
         #:value => (tag.value rescue "???"),
diff --git a/lib/rpm/lead.rb b/lib/rpm/lead.rb
index 3a45d5cc57..4261190412 100644
--- a/lib/rpm/lead.rb
+++ b/lib/rpm/lead.rb
@@ -2,7 +2,7 @@
 
 class RPMFile::Lead
   #struct rpmlead {
-  attr_accessor :magic #unsigned char magic[4]; 
+  attr_accessor :magic #unsigned char magic[4];
   attr_accessor :major #unsigned char major;
   attr_accessor :minor #unsigned char minor;
   attr_accessor :type  #short type;
@@ -12,7 +12,7 @@ class RPMFile::Lead
   attr_accessor :signature_type #short signature_type;
   attr_accessor :reserved #char reserved[16];
   #}
-  
+
   attr_accessor :length
 
   def initialize(rpm)
@@ -29,7 +29,7 @@ def type
       raise "Unknown package 'type' value #{@type}"
     end
   end # def type
-  
+
   def read
     # Use 'A' here instead of 'a' to trim nulls.
     @length = 96
diff --git a/lib/rpm/rpmfile.rb b/lib/rpm/rpmfile.rb
index 28859c5c37..838725cfa8 100644
--- a/lib/rpm/rpmfile.rb
+++ b/lib/rpm/rpmfile.rb
@@ -8,7 +8,7 @@
 # source code, but mostly it started making more sense after reading this site:
 # http://www.rpm.org/max-rpm/s1-rpm-file-format-rpm-file-format.html
 
-class RPMFile 
+class RPMFile
   attr_reader :file
 
   def initialize(file)
diff --git a/misc/pkgsrc.sh b/misc/pkgsrc.sh
index 99b94cb533..5c5f15c4d2 100755
--- a/misc/pkgsrc.sh
+++ b/misc/pkgsrc.sh
@@ -11,7 +11,7 @@ if [ ! -f "build/usr/local/bin/bmake" ] ; then
   # TODO(sissel): Maybe bootstrap ourselves.
   echo "This script requires pkgsrc to be bootstrapped in a specific way."
   echo "I expected to find file: build/usr/local/bin/bmake and did not"
-  echo 
+  echo
   echo "Bootstrap with:"
   echo "SH=/bin/bash ./bootstrap/bootstrap --unprivileged --prefix $PWD/build/usr/local --pkgdbdir $PWD/pkgdb"
   exit 1
@@ -37,7 +37,7 @@ for target in $TARGETS; do
   set --
 
   eval "$(bmake -C $target show-vars-eval VARS="PKGNAME PKGVERSION")"
-  name="$(echo "$PKGNAME" | sed -e "s/-$PKGVERSION\$//")" 
+  name="$(echo "$PKGNAME" | sed -e "s/-$PKGVERSION\$//")"
   orig_version=${PKGVERSION}
   version=${PKGVERSION}-pkgsrc
 
@@ -52,8 +52,8 @@ for target in $TARGETS; do
     clean package || exit 1
 
   # Start building fpm args
-  set -- -n "$name" -v "$version" --prefix $LOCALBASE 
-  
+  set -- -n "$name" -v "$version" --prefix $LOCALBASE
+
   # Skip the pkgsrc package metadata files
   set -- "$@" --exclude '+*'
 
@@ -64,9 +64,9 @@ for target in $TARGETS; do
     set -- "$@" -d "$PKGNAME (= $PKGVERSION-pkgsrc)"
   done
 
-  set -- -s tar -t deb "$@" 
-  set -- "$@" packages/All/$name-$orig_version.tgz 
-  fpm "$@" 
+  set -- -s tar -t deb "$@"
+  set -- "$@" packages/All/$name-$orig_version.tgz
+  fpm "$@"
 done
-  
+
 
diff --git a/templates/deb.erb b/templates/deb.erb
index 6e62f2dddd..a0b0d7431b 100644
--- a/templates/deb.erb
+++ b/templates/deb.erb
@@ -14,7 +14,7 @@ Provides: <%= provides.join(", ") -%>
 Replaces: <%= properrepl.flatten.join(", ") %>
 <% end -%>
 Standards-Version: 3.9.1
-Section: <%= category or "unknown" %> 
+Section: <%= category or "unknown" %>
 Priority: extra
 Homepage: <%= url or "http://nourlgiven.example.com/" %>
 Description: <%= name %> (FPM-generated package)
diff --git a/templates/rpm.erb b/templates/rpm.erb
index 03337a4382..1d2d846cbb 100644
--- a/templates/rpm.erb
+++ b/templates/rpm.erb
@@ -14,7 +14,7 @@ Group: <%= category %>
 TODO: [Jay] rpms require a license
 let's detect it intelligently
 -%>
-License: <%= license %> 
+License: <%= license %>
 URL: <%= url or "http://nourlgiven.example.com/" %>
 Source0:  %{_sourcedir}/data.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -28,7 +28,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
       nextversion = version.split(".").collect { |v| v.to_i }
       l = nextversion.length
       nextversion[l-2] += 1
-      nextversion[l-1] = 0 
+      nextversion[l-1] = 0
       nextversion = nextversion.join(".")
       ["#{name} >= #{version}", "#{name} < #{nextversion}"]
     # Convert gem >= A.B.C <= X.Y.Z to '>= A.B.C' and '<= X.Y.Z'