diff --git a/Makefile.am b/Makefile.am
index ae98909e0..ecc325797 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -54,11 +54,6 @@ scd = scd
 else
 scd =
 endif
-#if BUILD_G13
-#g13 = g13
-#else
-#g13 =
-#endif
 if BUILD_TOOLS
 tools = tools
 else
@@ -77,7 +72,7 @@ tests = tests
 endif
 
 SUBDIRS = m4 gl include jnlib common ${kbx} \
- ${gpg} ${keyserver} ${sm} ${agent} ${scd} ${g13} ${tools} po ${doc} ${tests}
+ ${gpg} ${keyserver} ${sm} ${agent} ${scd} ${tools} po ${doc} ${tests}
 
 dist_doc_DATA = README
 
diff --git a/configure.ac b/configure.ac
index 2b769c2fc..31a3516e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1453,7 +1453,6 @@ g10/Makefile
 sm/Makefile
 agent/Makefile
 scd/Makefile
-g13/Makefile
 keyserver/Makefile
 keyserver/gpg2keys_mailto
 keyserver/gpg2keys_test
diff --git a/jnlib/logging.c b/jnlib/logging.c
index fb41b45ef..40b58aeb9 100644
--- a/jnlib/logging.c
+++ b/jnlib/logging.c
@@ -171,9 +171,9 @@ fun_writer (void *cookie_arg, const char *buffer, my_funopen_hook_size_t size)
           if (!running_detached)
             {
               /* Due to all the problems with apps not running
-                 detahced but beeing caled with stderr closed or
+                 detached but being called with stderr closed or
                  used for a different purposes, it does not make
-                 sense to switch to stderr.  We tehrefore disable it. */
+                 sense to switch to stderr.  We therefore disable it. */
               if (!cookie->quiet)
                 {
                   /* fputs ("switching logging to stderr\n", stderr);*/