diff --git a/appl/popper/Makefile.am b/appl/popper/Makefile.am
index 80c7ad041..98ca1aabd 100644
--- a/appl/popper/Makefile.am
+++ b/appl/popper/Makefile.am
@@ -4,6 +4,8 @@ AUTOMAKE_OPTIONS = no-dependencies foreign
 
 INCLUDES = -I$(top_builddir)/include $(INCLUDE_krb4)
 
+CFLAGS = @CFLAGS@ $(WFLAGS)
+
 noinst_PROGRAMS = pop_debug
 
 libexec_PROGRAMS = popper
@@ -14,6 +16,7 @@ popper_SOURCES = \
 	pop_last.c pop_list.c pop_log.c \
 	pop_msg.c pop_parse.c pop_pass.c pop_quit.c \
 	pop_rset.c pop_send.c pop_stat.c pop_updt.c \
-	pop_user.c pop_uidl.c pop_xover.c popper.c
+	pop_user.c pop_uidl.c pop_xover.c popper.c \
+	maildir.c
 
 LDADD = -L$(top_builddir)/lib/krb5 -lkrb5 $(LIB_otp) -L$(top_builddir)/lib/des -ldes $(LIB_krb4) -L$(top_builddir)/lib/asn1 -lasn1 -L$(top_builddir)/lib/roken -lroken