diff --git a/desmume/Makefile.am b/desmume/Makefile.am
index ffbdc3bf8..e27bfad9d 100644
--- a/desmume/Makefile.am
+++ b/desmume/Makefile.am
@@ -1,5 +1,5 @@
 EXTRA_DIST = README.LIN README.WIN autogen.sh \
-		intltool-extract.in intltool-merge.in intltool-update.in
-DISTCLEANFILES = intltool-extract intltool-merge intltool-update
+		$(PO_FILES_IN)
+DISTCLEANFILES = $(PO_FILES)
 SUBDIRS = $(PO_DIR) src
 
diff --git a/desmume/configure.ac b/desmume/configure.ac
index f3bb5ccfb..eb1cbcce6 100644
--- a/desmume/configure.ac
+++ b/desmume/configure.ac
@@ -99,6 +99,8 @@ fi
 
 dnl - Determine which UIs to build and if po/ should be included
 PO_DIR=""
+PO_FILES=""
+PO_FILES_IN=""
 if test "x$HAVE_SDL" = "xyes"; then
   # SDL adds just a cli
   UI_DIR="cli $UI_DIR"
@@ -119,6 +121,8 @@ if test "x$HAVE_SDL" = "xyes"; then
     AM_GLIB_GNU_GETTEXT
     AC_PROG_INTLTOOL
     PO_DIR="po"
+    PO_FILES="intltool-extract intltool-merge intltool-update"
+    PO_FILES_IN="intltool-extract.in intltool-merge.in intltool-update.in"
   fi
 fi
 
@@ -138,6 +142,8 @@ esac
 
 AC_SUBST(UI_DIR)
 AC_SUBST(PO_DIR)
+AC_SUBST(PO_FILES)
+AC_SUBST(PO_FILES_IN)
 
 dnl - Compiler warnings