diff --git a/g10/Makefile.am b/g10/Makefile.am
index 1b52e641d..d6fbe920b 100644
--- a/g10/Makefile.am
+++ b/g10/Makefile.am
@@ -49,7 +49,9 @@ noinst_PROGRAMS = gpg
 if !HAVE_W32CE_SYSTEM
 noinst_PROGRAMS += gpgv
 endif
+if MAINTAINER_MODE
 noinst_PROGRAMS += gpgcompose $(module_tests)
+endif
 TESTS = $(module_tests)
 
 if ENABLE_BZIP2_SUPPORT
diff --git a/g10/gpgcompose.c b/g10/gpgcompose.c
index 7bb0e04bd..d6f030739 100644
--- a/g10/gpgcompose.c
+++ b/g10/gpgcompose.c
@@ -1,4 +1,4 @@
-/* gpgcompose.c - Create OpenPGP messages by hand.
+/* gpgcompose.c - Maintainer tool to create OpenPGP messages by hand.
  * Copyright (C) 2016 g10 Code GmbH
  *
  * This file is part of GnuPG.