diff --git a/.gitignore b/.gitignore
index deb12a6..26e322c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,4 +32,3 @@ Makefile.in
 /missing
 /stamp-h1
 *.in~
-pam/i3lock
diff --git a/README.md b/README.md
index fd4687c..1a9cabc 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@
 ### The world's most popular non-default computer lockscreen.
 **A modern version of i3lock with color functionality and other features.**
 
-![i3lock-color in action](screenshot.png "Screenshot sample")
+![i3lock-color in action](examples/screenshot.png "Screenshot sample")
 
 i3lock is a simple screen locker like slock. After starting it, you will see a white screen (you can configure the color/an image). You can return to your screen by entering your password.
 
diff --git a/configure.ac b/configure.ac
index 7a65794..7fa23a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -68,8 +68,7 @@ AC_FUNC_STRNLEN
 AC_CHECK_FUNCS([atexit dup2 ftruncate getcwd gettimeofday localtime_r memchr memset mkdir rmdir setlocale socket strcasecmp strchr strdup strerror strncasecmp strndup strrchr strspn strstr strtol strtoul], , [AC_MSG_FAILURE([cannot find the $ac_func function, which i3lock requires])])
 AC_CHECK_FUNCS([explicit_bzero])
 
-# Checks for libraries.
-
+# Check for libraries
 AC_SEARCH_LIBS([floor], [m], , [AC_MSG_FAILURE([cannot find the required floor() function despite trying to link with -lm])])
 
 # libev does not ship with a pkg-config file :(.
diff --git a/lock.sh b/examples/lock.sh
old mode 100755
new mode 100644
similarity index 79%
rename from lock.sh
rename to examples/lock.sh
index 430f257..14e8402
--- a/lock.sh
+++ b/examples/lock.sh
@@ -7,7 +7,7 @@ T='#ee00eeee'  # text
 W='#880000bb'  # wrong
 V='#bb00bbbb'  # verifying
 
-./x86_64-pc-linux-gnu/i3lock \
+i3lock \
 --insidevercolor=$C   \
 --ringvercolor=$V     \
 \
@@ -34,11 +34,3 @@ V='#bb00bbbb'  # verifying
 --timestr="%H:%M:%S"  \
 --datestr="%A, %m %Y" \
 --keylayout 1         \
-
-# --veriftext="Drinking verification can..."
-# --wrongtext="Nope!"
-# --textsize=20
-# --modsize=10
-# --timefont=comic-sans
-# --datefont=monofur
-# etc
diff --git a/lock_bar.sh b/examples/lock_bar.sh
old mode 100755
new mode 100644
similarity index 95%
rename from lock_bar.sh
rename to examples/lock_bar.sh
index 38fa185..db1de45
--- a/lock_bar.sh
+++ b/examples/lock_bar.sh
@@ -7,7 +7,7 @@ T='#ee00eeee'  # text
 W='#880000bb'  # wrong
 V='#bb00bbbb'  # verifying
 
-./x86_64-pc-linux-gnu/i3lock \
+i3lock \
 --blur 5 \
 --bar-indicator \
 --bar-position y+h \
diff --git a/screenshot.png b/examples/screenshot.png
similarity index 100%
rename from screenshot.png
rename to examples/screenshot.png
diff --git a/pam/i3lock b/pam/i3lock
index 4945139..52716ec 100644
--- a/pam/i3lock
+++ b/pam/i3lock
@@ -1,7 +1,8 @@
 #
-# PAM configuration file for the i3lock-color screen locker. By default, it includes
-# the 'system-auth' configuration file (see /etc/pam.d/system-auth) for Arch and Gentoo
-# and 'login' for Debian. Note that vanilla i3lock upstream uses 'login' instead.
+# PAM configuration file for the i3lock-color screen locker. By default, it
+# includes the 'system-auth' configuration file (see /etc/pam.d/system-auth)
+# for Arch and Gentoo and 'login' for Debian. Note that upstream uses only
+# 'login', which breaks on Arch and Gentoo.
 #
 
 #auth include system-auth # For Arch/Gentoo