diff --git a/README.md b/README.md
index 879973c3..7de6a202 100644
--- a/README.md
+++ b/README.md
@@ -103,7 +103,7 @@ need **autoconf**, **automake**, **libtool** and **pkgconfig**.
 If compiling from the packaged source, unpack the tarball and change to the
 resulting directory.
 
-If compiling from a checked out repository, please make sure you've got the submodules 
+If compiling from a checked out repository, please make sure you've got the submodules
 cloned too (use `git clone --recursive https://github.com/neutrinolabs/xrdp`)
 
 Then run following commands to compile and install xrdp:
diff --git a/instfiles/Makefile.am b/instfiles/Makefile.am
index 92cc9cf2..552e411d 100644
--- a/instfiles/Makefile.am
+++ b/instfiles/Makefile.am
@@ -28,7 +28,7 @@ dist_startscript_DATA = \
   km-0000080c.ini \
   km-00000813.ini \
   km-00000816.ini \
-  km-0000100c.ini 
+  km-0000100c.ini
 
 #
 # platform specific files
diff --git a/instfiles/init.d/xrdp b/instfiles/init.d/xrdp
index f64e5965..cbf2bc70 100644
--- a/instfiles/init.d/xrdp
+++ b/instfiles/init.d/xrdp
@@ -73,7 +73,7 @@ case "$1" in
   start)
         check_root
         exitval=0
-        log_daemon_msg "Starting $DESC " 
+        log_daemon_msg "Starting $DESC "
         if pidofproc -p $PIDDIR/$NAME.pid $DAEMON > /dev/null; then
             log_progress_msg "$NAME apparently already running"
             log_end_msg 0
@@ -104,7 +104,7 @@ case "$1" in
 	    exit 0
 	}
         exitval=0
-        log_daemon_msg "Stopping RDP Session manager " 
+        log_daemon_msg "Stopping RDP Session manager "
         log_progress_msg "sesman"
         if pidofproc -p  $PIDDIR/xrdp-sesman.pid $SDAEMON  > /dev/null; then
             start-stop-daemon --stop --quiet --oknodo --pidfile $PIDDIR/xrdp-sesman.pid \
diff --git a/sesman/Makefile.am b/sesman/Makefile.am
index 207890ac..d965f46c 100644
--- a/sesman/Makefile.am
+++ b/sesman/Makefile.am
@@ -19,7 +19,7 @@ AUTH_LIB = -lcrypt
 else
 if SESMAN_BSD
 AUTH_C = verify_user_bsd.c
-AUTH_LIB = 
+AUTH_LIB =
 else
 if SESMAN_PAMUSERPASS
 AUTH_C = verify_user_pam_userpass.c
diff --git a/tcutils/README.txt b/tcutils/README.txt
index 31ebb1f8..342dc891 100644
--- a/tcutils/README.txt
+++ b/tcutils/README.txt
@@ -14,7 +14,7 @@ to build tcutils:
 qmake
 make
 
-To run tcutils: 
+To run tcutils:
 ---------------
 include xrdpapi/.libs in your LD_LIBRARY_PATH
 
diff --git a/tests/gtcp_proxy/Makefile b/tests/gtcp_proxy/Makefile
index 4f4c2930..592704f4 100644
--- a/tests/gtcp_proxy/Makefile
+++ b/tests/gtcp_proxy/Makefile
@@ -3,7 +3,7 @@
 # = evaluates the expression each time it is used
 
 CFLAGS := $(shell pkg-config --cflags gtk+-2.0)
-CFLAGS += -O2 -Wall 
+CFLAGS += -O2 -Wall
 #LDFLAGS = -Wl
 LIBS := $(shell pkg-config --libs gtk+-2.0)
 LIBS += -ldl -lgthread-2.0
diff --git a/vrplayer/README.txt b/vrplayer/README.txt
index 3584aaec..4640395a 100644
--- a/vrplayer/README.txt
+++ b/vrplayer/README.txt
@@ -1,5 +1,5 @@
-A QT based media player that runs on a RDP server and 
-redirects audio/video to the client where it is decoded 
+A QT based media player that runs on a RDP server and
+redirects audio/video to the client where it is decoded
 and rendered locally
 
 Required packages to build vrplayer:
@@ -7,7 +7,7 @@ Required packages to build vrplayer:
 libqt4-gui
 qt4-dev-tools
 libavutil-dev
-libavformat-dev 
+libavformat-dev
 
 to build vrplayer
 -----------------
@@ -17,7 +17,7 @@ cd ..
 qmake
 make
 
-To run vrplayer 
+To run vrplayer
 ---------------
 include xrdpapi/.libs and xrdpvr/.libs in your LD_LIBRARY_PATH
 
diff --git a/xorg/tests/xdemo/Makefile b/xorg/tests/xdemo/Makefile
index a4c75110..6c98d1ce 100644
--- a/xorg/tests/xdemo/Makefile
+++ b/xorg/tests/xdemo/Makefile
@@ -1,11 +1,11 @@
 
 CFLAGS = -Werror -Wall
 
-all: xdemo 
+all: xdemo
 
 xdemo: xdemo.c bmp_parser.c
 	gcc $(CFLAGS) xdemo.c bmp_parser.c -o xdemo -lX11
 
-.PHONY clean: 
+.PHONY clean:
 	rm -f *.o xdemo
 
diff --git a/xrdp/xrdp_keyboard.ini b/xrdp/xrdp_keyboard.ini
index 3ce7644a..299239dd 100644
--- a/xrdp/xrdp_keyboard.ini
+++ b/xrdp/xrdp_keyboard.ini
@@ -9,7 +9,7 @@
 ;      Based on the "keylayout" value from the client, find the right x11
 ;      layout value.
 ;   3. model/variant are inferred based on the "keyboard_type" and
-;      "keyboard_subtype", but they can be overridden. 
+;      "keyboard_subtype", but they can be overridden.
 ;
 
 ;