diff --git a/configure.ac b/configure.ac
index de3710e6cd..878307926a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2878,6 +2878,7 @@ plug-ins/script-fu/tinyscheme/Makefile
 plug-ins/selection-to-path/Makefile
 plug-ins/twain/Makefile
 plug-ins/common/Makefile
+plug-ins/goat-exercises/Makefile
 modules/Makefile
 devel-docs/Makefile
 devel-docs/app/Makefile
diff --git a/plug-ins/Makefile.am b/plug-ins/Makefile.am
index 23a89c8770..2387906c2a 100644
--- a/plug-ins/Makefile.am
+++ b/plug-ins/Makefile.am
@@ -46,6 +46,7 @@ SUBDIRS = \
 	fractal-explorer	\
 	gfig			\
 	gimpressionist		\
+	goat-exercises		\
 	gradient-flare		\
 	help			\
 	$(help_browser)		\
diff --git a/plug-ins/common/.gitignore b/plug-ins/common/.gitignore
index c393eae581..d44397acbe 100644
--- a/plug-ins/common/.gitignore
+++ b/plug-ins/common/.gitignore
@@ -108,8 +108,6 @@
 /file-xwd.exe
 /film
 /film.exe
-/goat-exercise
-/goat-exercise.exe
 /gradient-map
 /gradient-map.exe
 /grid
diff --git a/plug-ins/common/Makefile.am b/plug-ins/common/Makefile.am
index d5975fa304..834824cd95 100644
--- a/plug-ins/common/Makefile.am
+++ b/plug-ins/common/Makefile.am
@@ -99,7 +99,6 @@ file_xmc_libexecdir = $(gimpplugindir)/plug-ins/file-xmc
 file_xpm_libexecdir = $(gimpplugindir)/plug-ins/file-xpm
 file_xwd_libexecdir = $(gimpplugindir)/plug-ins/file-xwd
 film_libexecdir = $(gimpplugindir)/plug-ins/film
-goat_exercise_libexecdir = $(gimpplugindir)/plug-ins/goat-exercise
 gradient_map_libexecdir = $(gimpplugindir)/plug-ins/gradient-map
 grid_libexecdir = $(gimpplugindir)/plug-ins/grid
 guillotine_libexecdir = $(gimpplugindir)/plug-ins/guillotine
@@ -177,7 +176,6 @@ file_xmc_libexec_PROGRAMS = $(FILE_XMC)
 file_xpm_libexec_PROGRAMS = $(FILE_XPM)
 file_xwd_libexec_PROGRAMS = file-xwd
 film_libexec_PROGRAMS = film
-goat_exercise_libexec_PROGRAMS = goat-exercise
 gradient_map_libexec_PROGRAMS = gradient-map
 grid_libexec_PROGRAMS = grid
 guillotine_libexec_PROGRAMS = guillotine
@@ -1201,22 +1199,6 @@ film_LDADD = \
 	$(INTLLIBS)		\
 	$(film_RC)
 
-goat_exercise_SOURCES = \
-	goat-exercise.c
-
-goat_exercise_LDADD = \
-	$(libgimp)		\
-	$(libgimpmath)		\
-	$(libgimpconfig)	\
-	$(libgimpcolor)		\
-	$(libgimpbase)		\
-	$(CAIRO_LIBS)		\
-	$(GDK_PIXBUF_LIBS)	\
-	$(GEGL_LIBS)		\
-	$(RT_LIBS)		\
-	$(INTLLIBS)		\
-	$(goat_exercise_RC)
-
 gradient_map_SOURCES = \
 	gradient-map.c
 
diff --git a/plug-ins/common/gimprc.common b/plug-ins/common/gimprc.common
index 36bc2cfa75..c17fe2991b 100644
--- a/plug-ins/common/gimprc.common
+++ b/plug-ins/common/gimprc.common
@@ -51,7 +51,6 @@ file_xmc_RC = file-xmc.rc.o
 file_xpm_RC = file-xpm.rc.o
 file_xwd_RC = file-xwd.rc.o
 film_RC = film.rc.o
-goat_exercise_RC = goat-exercise.rc.o
 gradient_map_RC = gradient-map.rc.o
 grid_RC = grid.rc.o
 guillotine_RC = guillotine.rc.o
diff --git a/plug-ins/common/plugin-defs.pl b/plug-ins/common/plugin-defs.pl
index 43354c0bb2..ded322b0e8 100644
--- a/plug-ins/common/plugin-defs.pl
+++ b/plug-ins/common/plugin-defs.pl
@@ -52,7 +52,6 @@
     'file-xpm' => { ui => 1, gegl => 1, optional => 1, libs => 'XPM_LIBS' },
     'file-xwd' => {  ui => 1, gegl => 1 },
     'film' => { ui => 1, gegl => 1 },
-    'goat-exercise' => { gegl => 1 },
     'gradient-map' => { gegl => 1 },
     'grid' => { ui => 1, gegl => 1 },
     'guillotine' => {},
diff --git a/plug-ins/goat-exercises/Makefile.am b/plug-ins/goat-exercises/Makefile.am
new file mode 100644
index 0000000000..7c61a465d6
--- /dev/null
+++ b/plug-ins/goat-exercises/Makefile.am
@@ -0,0 +1,54 @@
+## Process this file with automake to produce Makefile.in
+
+if OS_WIN32
+mwindows = -mwindows
+else
+libm = -lm
+endif
+
+if PLATFORM_OSX
+xobjective_c = "-xobjective-c"
+framework_cocoa = -framework Cocoa
+endif
+
+if HAVE_WINDRES
+include $(top_srcdir)/build/windows/gimprc-plug-ins.rule
+goat_exercise_RC = goat-exercise.rc.o
+endif
+
+libgimp = $(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la
+libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la
+libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la
+libgimpconfig = $(top_builddir)/libgimpconfig/libgimpconfig-$(GIMP_API_VERSION).la
+libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la $(libm)
+libgimpmodule = $(top_builddir)/libgimpmodule/libgimpmodule-$(GIMP_API_VERSION).la
+libgimpui = $(top_builddir)/libgimp/libgimpui-$(GIMP_API_VERSION).la
+libgimpwidgets = $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la
+
+AM_LDFLAGS = $(mwindows)
+
+AM_CPPFLAGS = \
+	-I$(top_srcdir)	\
+	$(GTK_CFLAGS)	\
+	$(GEGL_CFLAGS)	\
+	-I$(includedir)
+
+goat_exercise_libexecdir = $(gimpplugindir)/plug-ins/goat-exercise
+
+goat_exercise_libexec_PROGRAMS = goat-exercise
+
+goat_exercise_SOURCES = \
+	goat-exercise.c
+
+goat_exercise_LDADD = \
+	$(libgimp)		\
+	$(libgimpmath)		\
+	$(libgimpconfig)	\
+	$(libgimpcolor)		\
+	$(libgimpbase)		\
+	$(CAIRO_LIBS)		\
+	$(GDK_PIXBUF_LIBS)	\
+	$(GEGL_LIBS)		\
+	$(RT_LIBS)		\
+	$(INTLLIBS)		\
+	$(goat_exercise_RC)
diff --git a/plug-ins/common/goat-exercise.c b/plug-ins/goat-exercises/goat-exercise.c
similarity index 100%
rename from plug-ins/common/goat-exercise.c
rename to plug-ins/goat-exercises/goat-exercise.c