diff --git a/synfig-studio/Makefile.am b/synfig-studio/Makefile.am
index f862546..8e9b202 100644
--- a/synfig-studio/Makefile.am
+++ b/synfig-studio/Makefile.am
@@ -28,11 +28,15 @@ DISTCLEANFILES = \
 	synfigstudio.desktop \
 	$(appdata_DATA)
 
+if WITH_IMAGES
+IMAGE_DIR = images
+endif
+
 SUBDIRS = \
 	build_tools \
 	brushes \
 	src \
-	images \
+	$(IMAGE_DIR) \
 	plugins \
 	po
 
@@ -71,8 +75,10 @@ appdata_DATA = synfigstudio.appdata.xml
 @INTLTOOL_XML_RULE@
 
 # Icon
+if WITH_IMAGES
 icondir                 = $(datadir)/pixmaps
 icon_DATA               = images/synfig_icon.png images/sif_icon.png
+endif
 
 mimedir              = $(prefix)/share/mime/packages
 mime_DATA            = synfigstudio.xml
diff --git a/synfig-studio/configure.ac b/synfig-studio/configure.ac
index 9e8eef7..05b636d 100755
--- a/synfig-studio/configure.ac
+++ b/synfig-studio/configure.ac
@@ -171,6 +171,14 @@ AC_ARG_ENABLE(update-mimedb,
     enable_update_mimedb=yes)
 AM_CONDITIONAL(ENABLE_UPDATE_MIMEDB, (test x$enable_update_mimedb = xyes) && (test x$UPDATE_MIME_DATABASE != xno))
 
+AC_ARG_WITH([images], 
+    AS_HELP_STRING([--without-images], [skip building images]),
+    [],
+    [with_images=yes]
+)
+
+AM_CONDITIONAL([WITH_IMAGES], [test "x$with_images" != "xno"])
+
 AC_CONFIG_FILES([
     Makefile
     build_tools/Makefile
@@ -207,6 +215,7 @@ Debug Mode -----------------------> $debug
 Profiling Mode -------------------> $profiling
 Optimizations --------------------> $optimization
 JACK Enabled ---------------------> $enable_jack
+Build images ---------------------> $with_images
 
 "'$'"CXX ------------------------------> '$CXX'
 "'$'"CXXFLAGS -------------------------> '$CXXFLAGS'