diff --git a/configure.ac b/configure.ac
index 9990fd36fe0c2e7d95de92922ac3eae54edb7e74..f3d104b11ad424ca021a05a5bcf57f3e9a0667e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,7 +53,7 @@ AC_CHECK_HEADERS(getopt.h libintl.h limits.h regex.h sys/param.h wchar.h wctype.
 
 dnl Checks for options.
 
-AC_ARG_ENABLE(debug, 
+AC_ARG_ENABLE(debug,
 [  --enable-debug          Enable debugging (disabled by default)],
 [if test x$enableval = xyes; then
     AC_DEFINE(DEBUG, 1, [Define this to enable debug messages and assert warnings.]) debug_support=yes
@@ -98,7 +98,7 @@ fi])
 AC_ARG_ENABLE(justify,
 [  --disable-justify       Disable justify/unjustify functions],
 [if test x$enableval != xyes; then
-    AC_DEFINE(DISABLE_JUSTIFY, 1, [Define this to disable the justify routines.]) 
+    AC_DEFINE(DISABLE_JUSTIFY, 1, [Define this to disable the justify routines.])
 fi])
 
 AC_ARG_ENABLE(mouse,
@@ -122,7 +122,7 @@ fi])
 AC_ARG_ENABLE(tabcomp,
 [  --disable-tabcomp       Disable tab completion functions],
 [if test x$enableval != xyes; then
-    AC_DEFINE(DISABLE_TABCOMP, 1, [Define to disable the tab completion functions for files and search strings.]) 
+    AC_DEFINE(DISABLE_TABCOMP, 1, [Define to disable the tab completion functions for files and search strings.])
 fi])
 
 AC_ARG_ENABLE(wrapping,
diff --git a/src/files.c b/src/files.c
index 73a73a70c63d038cefd06ac9a9fb4be8bbf2afa8..141b4deab025435444cf7b9018a3539289a96aea 100644
--- a/src/files.c
+++ b/src/files.c
@@ -1995,7 +1995,7 @@ char *real_dir_from_tilde(const char *buf)
 	size_t i = 1;
 	char *tilde_dir;
 
-	/* Figure out how much of the str we need to compare. */
+	/* Figure out how much of the string we need to compare. */
 	for (; buf[i] != '/' && buf[i] != '\0'; i++)
 	    ;