diff --git a/.gitignore b/.gitignore
index e9d3966..8d709c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,41 +1,43 @@
 *.lo
 *.o
 .deps/
 .libs/
 /aclocal.m4
 /autom4te.cache
 /config.h.in
 /config.h
 /config.log
 /config.status
 /configure
 /Makefile.in
 autom4te.cache/
 assuan/Makefile.in
 assuan/Makefile
 curses/Makefile.in
 curses/Makefile
 doc/Makefile.in
 doc/Makefile
 doc/pinentry.info
 doc/stamp-vti
 doc/version.texi
+fltk/Makefile.in
+fltk/Makefile
 gtk+-2/Makefile.in
 gtk+-2/Makefile
 gnome3/Makefile.in
 gnome3/Makefile
 pinentry/Makefile.in
 pinentry/Makefile
 qt/Makefile.in
 qt/Makefile
 secmem/Makefile.in
 secmem/Makefile
 w32/Makefile.in
 w32/Makefile
 tty/Makefile.in
 tty/Makefile
 /qt/pinentryconfirm.moc
 /qt/pinentrydialog.moc
 /qt/qsecurelineedit.moc
 /m4/Makefile.in
 /emacs/Makefile.in
diff --git a/fltk/Makefile.am b/fltk/Makefile.am
index 2c9338f..54209f9 100644
--- a/fltk/Makefile.am
+++ b/fltk/Makefile.am
@@ -1,16 +1,21 @@
 # Makefile.am - PIN entry FLTK frontend.
 
 bin_PROGRAMS = pinentry-fltk
 
 if FALLBACK_CURSES
 ncurses_include = $(NCURSES_INCLUDE)
 libcurses = ../pinentry/libpinentry-curses.a $(LIBCURSES) $(LIBICONV)
 else
 ncurses_include =
 libcurses =
 endif
 
 AM_CPPFLAGS = $(COMMON_CFLAGS) $(FLTKCXXFLAGS) $(ncurses_include) -I$(top_srcdir)/secmem -I$(top_srcdir)/pinentry
+AM_CXXFLAGS = -std=c++11
 LDADD = ../pinentry/libpinentry.a ../secmem/libsecmem.a $(COMMON_LIBS) $(LIBCAP) $(FLTKLIBS) $(libcurses)
 
-pinentry_fltk_SOURCES = main.cxx pinwindow.cxx passwindow.cxx qualitypasswindow.cxx
+pinentry_fltk_SOURCES = main.cxx pinwindow.cxx pinwindow.h \
+			passwindow.cxx passwindow.h \
+			qualitypasswindow.cxx qualitypasswindow.h
+
+EXTRA_DIST = encrypt.xpm icon.xpm