diff --git a/ap-ometer/Makefile b/ap-ometer/Makefile
index bdabc614d57..9067c84ad60 100644
--- a/ap-ometer/Makefile
+++ b/ap-ometer/Makefile
@@ -16,7 +16,7 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-freetype=${BUILDLINK_PREFIX.freetype2}
 CONFIGURE_ARGS+=	--with-libpng=${BUILDLINK_PREFIX.png}
 CONFIGURE_ARGS+=	--with-db=${BUILDLINK_PREFIX.db4}
-CONFIGURE_ARGS+=	--with-jpeg=${BUILDLINK_PREFIX.jpeg}
+CONFIGURE_ARGS+=	--with-jpeg=${JPEGBASE}
 CONFIGURE_ARGS+=	--with-libpng=${BUILDLINK_PREFIX.png}
 CONFIGURE_ARGS+=	--with-odometerdb=${VARBASE}/odometer/odometer.db
 
@@ -28,7 +28,7 @@ BUILDLINK_TRANSFORM+=l:db:db4
 .include "../../www/apache/module.mk"
 
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../databases/db4/buildlink3.mk"
 .include "../../graphics/gd/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
diff --git a/armagetronad/Makefile b/armagetronad/Makefile
index f238313ad71..ac34107e7f7 100644
--- a/armagetronad/Makefile
+++ b/armagetronad/Makefile
@@ -8,5 +8,5 @@ COMMENT=	Tron clone in 3D with advanced gameplay and multiplayer
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../graphics/SDL_image/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../wip/armagetronad/Makefile.common"
diff --git a/avifile-devel/options.mk b/avifile-devel/options.mk
index 42e1f9ed8e6..c70801981b9 100644
--- a/avifile-devel/options.mk
+++ b/avifile-devel/options.mk
@@ -130,7 +130,7 @@ CONFIGURE_ARGS+=	--disable-ac3passthrough
 .endif
 
 .if !empty(PKG_OPTIONS:Mjpeg)
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 PLIST.jpeg=		yes
 .endif
 
diff --git a/boinc-lib/Makefile.common b/boinc-lib/Makefile.common
index a7ee27b48b4..24d1fd0ab15 100644
--- a/boinc-lib/Makefile.common
+++ b/boinc-lib/Makefile.common
@@ -29,7 +29,7 @@ PKG_SUGGESTED_OPTIONS=	gui
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mgui)
-.	include "../../graphics/jpeg/buildlink3.mk"
+.	include "../../mk/jpeg.buildlink3.mk"
 .	include "../../graphics/MesaLib/buildlink3.mk"
 .	include "../../graphics/glu/buildlink3.mk"
 .	include "../../graphics/glut/buildlink3.mk"
diff --git a/chromium/Makefile.common b/chromium/Makefile.common
index 1619261dc38..393f934ed87 100644
--- a/chromium/Makefile.common
+++ b/chromium/Makefile.common
@@ -130,7 +130,7 @@ do-install:
 .include "../../devel/libevent/buildlink3.mk"
 .include "../../devel/nss/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../lang/python/pyversion.mk"
 .include "../../wip/libvpx/buildlink3.mk"
diff --git a/cinelerra-cv/Makefile b/cinelerra-cv/Makefile
index 6e3b3d104ca..be373acd4ed 100644
--- a/cinelerra-cv/Makefile
+++ b/cinelerra-cv/Makefile
@@ -53,7 +53,7 @@ BUILD_DEPENDS+=	nasm-[0-9]*:../../devel/nasm
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../wip/libuuid/buildlink3.mk" # should be in "devel" category
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/openexr/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
diff --git a/cinelerra/Makefile b/cinelerra/Makefile
index e7b20560564..3faaa4ca591 100644
--- a/cinelerra/Makefile
+++ b/cinelerra/Makefile
@@ -48,7 +48,7 @@ USE_TOOLS+=		gmake
 #  libmpeg3
 # jpeg-mmx
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 
diff --git a/crrcsim/Makefile b/crrcsim/Makefile
index 7f87bd739cc..f2f4cde8105 100644
--- a/crrcsim/Makefile
+++ b/crrcsim/Makefile
@@ -22,6 +22,6 @@ USE_LANGUAGES=	c c++
 .include "../../audio/portaudio/buildlink3.mk"
 .include "../../games/plib/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/directfb/Makefile b/directfb/Makefile
index d0d53592c37..d69d6f15ab9 100644
--- a/directfb/Makefile
+++ b/directfb/Makefile
@@ -26,7 +26,7 @@ CONFIGURE_ARGS+=	--with-gfxdrivers=all
 .endif
 
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/directfb/buildlink3.mk b/directfb/buildlink3.mk
index c867e97eca0..3f481efa623 100644
--- a/directfb/buildlink3.mk
+++ b/directfb/buildlink3.mk
@@ -11,7 +11,7 @@ BUILDLINK_PKGSRCDIR.DirectFB?=	../../wip/directfb
 
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
 .endif # DIRECTFB_BUILDLINK3_MK
diff --git a/djview4/Makefile b/djview4/Makefile
index 612fa5e1066..43a1513fdf3 100644
--- a/djview4/Makefile
+++ b/djview4/Makefile
@@ -19,5 +19,5 @@ USE_LANGUAGES=	c c++
 .include "../../x11/qt4-libs/buildlink3.mk"
 .include "../../x11/qt4-tools/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/efltk/Makefile b/efltk/Makefile
index 6ca4e8e281f..7edb53d1dcb 100644
--- a/efltk/Makefile
+++ b/efltk/Makefile
@@ -28,7 +28,7 @@ CONFIGURE_ARGS+=	--disable-shared
 .include "options.mk"
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
diff --git a/efltk/buildlink3.mk b/efltk/buildlink3.mk
index 9480a0b4830..ca3a5ccc363 100644
--- a/efltk/buildlink3.mk
+++ b/efltk/buildlink3.mk
@@ -10,7 +10,7 @@ BUILDLINK_ABI_DEPENDS.efltk?=	efltk>=2.0.8nb2
 BUILDLINK_PKGSRCDIR.efltk?=	../../x11/efltk
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
diff --git a/electricsheep-svn/Makefile b/electricsheep-svn/Makefile
index 0587f6a0708..1307c707b0e 100644
--- a/electricsheep-svn/Makefile
+++ b/electricsheep-svn/Makefile
@@ -40,7 +40,7 @@ do-install:
 	${INSTALL} -d -m 0755 ${DESTDIR}/${PREFIX}/libexec/xscreensaver/config
 	${INSTALL_DATA} ${WRKSRC}/electricsheep.xml ${DESTDIR}/${PREFIX}/libexec/xscreensaver/config
 
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 # for libavformat:
 .include "../../multimedia/ffmpeg/buildlink3.mk"
 .include "../../devel/libglade/buildlink3.mk"
diff --git a/electricsheep/Makefile b/electricsheep/Makefile
index 46ffd9a67c0..de7b126f09f 100644
--- a/electricsheep/Makefile
+++ b/electricsheep/Makefile
@@ -34,7 +34,7 @@ post-patch:
 	${SED} < ${WRKSRC}/electricsheep.c.orig > ${WRKSRC}/electricsheep.c \
 		-e 's|/usr/local/share|${DESTDIR}/${PREFIX}/share/electricsheep|'
 
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
diff --git a/emacs-current/options.mk b/emacs-current/options.mk
index 6a025e856c9..e3eacc9c4b4 100644
--- a/emacs-current/options.mk
+++ b/emacs-current/options.mk
@@ -64,7 +64,7 @@ CONFIGURE_ARGS+=	--with-tiff
 CONFIGURE_ARGS+=	--with-gif
 CONFIGURE_ARGS+=	--with-png
 
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../graphics/libungif/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
diff --git a/emboss-base/Makefile.common b/emboss-base/Makefile.common
index 1179ec30a08..40542bd83d1 100644
--- a/emboss-base/Makefile.common
+++ b/emboss-base/Makefile.common
@@ -31,6 +31,6 @@ PKG_DISTFILES_DIR=	emboss
 
 .include "../../graphics/gd/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
diff --git a/epeg/Makefile b/epeg/Makefile
index 4f4efab0428..2579eb7a00c 100644
--- a/epeg/Makefile
+++ b/epeg/Makefile
@@ -19,5 +19,5 @@ USE_LIBTOOL=	yes
 USE_TOOLS=	gmake pkg-config
 
 .include "../../wip/ecore/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/epeg/buildlink3.mk b/epeg/buildlink3.mk
index 5ba8f551543..1f634dded7d 100644
--- a/epeg/buildlink3.mk
+++ b/epeg/buildlink3.mk
@@ -10,7 +10,7 @@ BUILDLINK_ABI_DEPENDS.epeg?=	epeg>=0.9.1.042nb3
 BUILDLINK_PKGSRCDIR.epeg?=	../../wip/epeg
 
 .include	"../../wip/ecore/buildlink3.mk"
-.include	"../../graphics/jpeg/buildlink3.mk"
+.include	"../../mk/jpeg.buildlink3.mk"
 .endif # EPEG_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-epeg
diff --git a/esmart/Makefile b/esmart/Makefile
index c19beac1820..2a55e0fb145 100644
--- a/esmart/Makefile
+++ b/esmart/Makefile
@@ -28,5 +28,5 @@ pre-configure:
 .include "../../wip/epsilon/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../graphics/imlib2/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/esmart/buildlink3.mk b/esmart/buildlink3.mk
index 797f3bd046a..23853f99507 100644
--- a/esmart/buildlink3.mk
+++ b/esmart/buildlink3.mk
@@ -15,7 +15,7 @@ BUILDLINK_PKGSRCDIR.esmart?=	../../wip/esmart
 .include "../../wip/epsilon/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../graphics/imlib2/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .endif # ESMART_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-esmart
diff --git a/exact-image/Makefile b/exact-image/Makefile
index f194b516c13..3e89c713aed 100644
--- a/exact-image/Makefile
+++ b/exact-image/Makefile
@@ -28,7 +28,7 @@ post-extract:
 .include "../../graphics/agg/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/jasper/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/lcms/buildlink3.mk"
 .include "../../graphics/libungif/buildlink3.mk"
 .include "../../graphics/openexr/buildlink3.mk"
diff --git a/fbida/Makefile b/fbida/Makefile
index 861c6f83a9a..1b0c79af98f 100644
--- a/fbida/Makefile
+++ b/fbida/Makefile
@@ -16,7 +16,7 @@ USE_TOOLS+=		gmake perl
 
 # not used, even though the configure output claims it
 #.include "../../graphics/ImageMagick/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 #.include "../../graphics/sane-backends/buildlink3.mk"
diff --git a/flam3-svn/Makefile b/flam3-svn/Makefile
index ada9bb42aea..64117ca85c9 100644
--- a/flam3-svn/Makefile
+++ b/flam3-svn/Makefile
@@ -19,7 +19,7 @@ WRKSRC=			${WRKDIR}/flam3/src
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../wip/mk/svn-package.mk"
diff --git a/flimp/Makefile b/flimp/Makefile
index 09ae4ea7d86..18b6b392e25 100644
--- a/flimp/Makefile
+++ b/flimp/Makefile
@@ -19,7 +19,7 @@ USE_LANGUAGES+=	c c++
 DEPENDS+=	netpbm-[0-9]*:../../graphics/netpbm
 DEPENDS+=	pnmcurve-[0-9]*:../../wip/pnmcurve
 
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../x11/fltk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/freej/Makefile b/freej/Makefile
index dc8480656a3..3238afcf526 100644
--- a/freej/Makefile
+++ b/freej/Makefile
@@ -22,5 +22,5 @@ GNU_CONFIGURE=		yes
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../wip/alsa-lib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fs2open/Makefile b/fs2open/Makefile
index 81b9cf452df..559124ca463 100644
--- a/fs2open/Makefile
+++ b/fs2open/Makefile
@@ -29,7 +29,7 @@ do-install:
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../audio/openal/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../lang/lua/buildlink3.mk"
 .include "../../multimedia/libtheora/buildlink3.mk"
diff --git a/gpicview/Makefile b/gpicview/Makefile
index 70b4d32ed61..6797ddb7fc1 100644
--- a/gpicview/Makefile
+++ b/gpicview/Makefile
@@ -15,6 +15,6 @@ GNU_CONFIGURE=	yes
 USE_TOOLS+=			pkg-config gmake
 
 .include "../../x11/gtk2/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/grass/Makefile b/grass/Makefile
index 460c38b79ae..d4658101111 100644
--- a/grass/Makefile
+++ b/grass/Makefile
@@ -68,7 +68,7 @@ post-install:
 .include "../../geography/proj/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/gd/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../lang/tcl/buildlink3.mk"
diff --git a/gtklookat/Makefile b/gtklookat/Makefile
index b3a748af0c4..9d757dc17c6 100644
--- a/gtklookat/Makefile
+++ b/gtklookat/Makefile
@@ -18,7 +18,7 @@ LIBS+=		-lX11
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/glut/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../x11/gtkglarea/buildlink3.mk"
diff --git a/hplip/Makefile b/hplip/Makefile
index 17d3ba7a5d8..135ee372c1c 100644
--- a/hplip/Makefile
+++ b/hplip/Makefile
@@ -54,7 +54,7 @@ CONFIGURE_ARGS= --sysconfdir=${EGDIR:Q} \
 .include "../../textproc/py-xml/buildlink3.mk"
 .include "../../x11/py-qt3-base/buildlink3.mk"
 .include "../../devel/py-readline/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/sane-backends/buildlink3.mk"
 .include "../../print/cups/buildlink3.mk"
 .include "../../devel/libusb/buildlink3.mk"
diff --git a/hplip3/Makefile b/hplip3/Makefile
index 0bcab062e6e..e0163d588ed 100644
--- a/hplip3/Makefile
+++ b/hplip3/Makefile
@@ -139,7 +139,7 @@ post-install:
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../net/net-snmp/buildlink3.mk"
 .include "../../print/cups/buildlink3.mk"
 .include "../../print/ghostscript/buildlink3.mk"
diff --git a/hylafax-devel/Makefile b/hylafax-devel/Makefile
index d3ba2d6a282..2d7b3f56314 100644
--- a/hylafax-devel/Makefile
+++ b/hylafax-devel/Makefile
@@ -70,7 +70,7 @@ CONFIGURE_ARGS+=	--disable-pam
 .endif
 
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/hylafax/Makefile b/hylafax/Makefile
index 3bbea446749..870e941482a 100644
--- a/hylafax/Makefile
+++ b/hylafax/Makefile
@@ -68,7 +68,7 @@ CONFIGURE_ARGS+=	--disable-pam
 .endif
 
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/jp2a/Makefile b/jp2a/Makefile
index 6f7ff6a0068..a0e0816fcd3 100644
--- a/jp2a/Makefile
+++ b/jp2a/Makefile
@@ -30,7 +30,7 @@ CONFIGURE_ARGS+=	--disable-curl
 CONFIGURE_ARGS+=	--disable-termlib
 .endif
 
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 
 .if !empty(PKG_OPTIONS:Mcurl)
 .include "../../www/curl/buildlink3.mk"
diff --git a/jpgtn/Makefile b/jpgtn/Makefile
index 92c4917e3eb..73a9df7a347 100644
--- a/jpgtn/Makefile
+++ b/jpgtn/Makefile
@@ -13,5 +13,5 @@ COMMENT=		Thumbnail generator for JPEG images
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/kaffe-x11/Makefile b/kaffe-x11/Makefile
index 8c289fbfcad..c54fac78507 100644
--- a/kaffe-x11/Makefile
+++ b/kaffe-x11/Makefile
@@ -34,7 +34,7 @@ PRINT_PLIST_AWK+= /^@dirrm/ { print "@comment in kaffe: " $$0; next; }
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../graphics/libart/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/libungif/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../wip/kaffe/buildlink3.mk"
diff --git a/kvirc/Makefile b/kvirc/Makefile
index 1b270762f02..3651125091d 100644
--- a/kvirc/Makefile
+++ b/kvirc/Makefile
@@ -49,7 +49,7 @@ CONFIGURE_ARGS+=	--with-ix86-asm
 .include "../../audio/gsm/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../fonts/Xft2/buildlink3.mk"
 .include "../../lang/perl5/buildlink3.mk"
diff --git a/libpano12/Makefile b/libpano12/Makefile
index 5b67f3c7adc..4ec32853e93 100644
--- a/libpano12/Makefile
+++ b/libpano12/Makefile
@@ -19,7 +19,7 @@ post-extract:
 	${CP} ${FILESDIR}/makefile.netbsd ${WRKSRC}/makefile.netbsd
 
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../mk/java-vm.mk"
diff --git a/links-hacked/Makefile b/links-hacked/Makefile
index 29208b81a1b..1633bb45bca 100644
--- a/links-hacked/Makefile
+++ b/links-hacked/Makefile
@@ -63,7 +63,7 @@ pre-configure:
 
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../databases/gdbm/buildlink3.mk"
diff --git a/mapnik/Makefile b/mapnik/Makefile
index 37d46a1522d..765b09234c9 100644
--- a/mapnik/Makefile
+++ b/mapnik/Makefile
@@ -35,7 +35,7 @@ do-install:
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../geography/proj/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../lang/python/application.mk"
diff --git a/mapnik/buildlink3.mk b/mapnik/buildlink3.mk
index a36a1ba2471..d1f73033024 100644
--- a/mapnik/buildlink3.mk
+++ b/mapnik/buildlink3.mk
@@ -13,7 +13,7 @@ BUILDLINK_PKGSRCDIR.mapnik?=	../../wip/mapnik
 .include "../../devel/libltdl/buildlink3.mk"
 #.include "../../devel/zlib/buildlink3.mk"
 #.include "../../graphics/freetype2/buildlink3.mk"
-#.include "../../graphics/jpeg/buildlink3.mk"
+#.include "../../mk/jpeg.buildlink3.mk"
 #.include "../../graphics/png/buildlink3.mk"
 #.include "../../graphics/tiff/buildlink3.mk"
 #.include "../../geography/proj/buildlink3.mk"
diff --git a/molmol/Makefile b/molmol/Makefile
index 9218cb0c449..96021e20019 100644
--- a/molmol/Makefile
+++ b/molmol/Makefile
@@ -23,7 +23,7 @@ do-install:
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../mk/motif.buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
diff --git a/mplayer-mt/options.mk b/mplayer-mt/options.mk
index 984352bf8f3..06534d31fdf 100644
--- a/mplayer-mt/options.mk
+++ b/mplayer-mt/options.mk
@@ -179,7 +179,7 @@ CONFIGURE_ARGS+=	--disable-gif
 
 .if !empty(PKG_OPTIONS:Mjpeg)
 CONFIGURE_ARGS+=	--enable-jpeg
-.  include "../../graphics/jpeg/buildlink3.mk"
+.  include "../../mk/jpeg.buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-jpeg
 .endif
diff --git a/mplayer-share/options.mk b/mplayer-share/options.mk
index 75d5a81613e..21dade4e325 100644
--- a/mplayer-share/options.mk
+++ b/mplayer-share/options.mk
@@ -140,7 +140,7 @@ CONFIGURE_ARGS+=	--disable-gif
 
 .if !empty(PKG_OPTIONS:Mjpeg)
 CONFIGURE_ARGS+=	--enable-jpeg
-.  include "../../graphics/jpeg/buildlink3.mk"
+.  include "../../mk/jpeg.buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-jpeg
 .endif
diff --git a/mplayer-snapshot-share/options.mk b/mplayer-snapshot-share/options.mk
index c77222d419f..7bebda53e77 100644
--- a/mplayer-snapshot-share/options.mk
+++ b/mplayer-snapshot-share/options.mk
@@ -200,7 +200,7 @@ CONFIGURE_ARGS+=	--disable-gif
 
 .if !empty(PKG_OPTIONS:Mjpeg)
 CONFIGURE_ARGS+=	--enable-jpeg
-.  include "../../graphics/jpeg/buildlink3.mk"
+.  include "../../mk/jpeg.buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-jpeg
 .endif
diff --git a/navigatrix/Makefile b/navigatrix/Makefile
index b5c7af1053d..ad40df8a8ec 100644
--- a/navigatrix/Makefile
+++ b/navigatrix/Makefile
@@ -22,6 +22,6 @@ CONFIGURE_ARGS+=	--with-extra-libs=${LOCALBASE}/libs
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../audio/arts/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../x11/kdelibs3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/openvrml/Makefile b/openvrml/Makefile
index ef269fda96d..101fe105227 100644
--- a/openvrml/Makefile
+++ b/openvrml/Makefile
@@ -16,7 +16,7 @@ USE_TOOLS+=	gmake
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/glut/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
diff --git a/openvrml/buildlink3.mk b/openvrml/buildlink3.mk
index 2769b3afd0c..99a96d449c1 100644
--- a/openvrml/buildlink3.mk
+++ b/openvrml/buildlink3.mk
@@ -12,7 +12,7 @@ BUILDLINK_PKGSRCDIR.openvrml?=	../../wip/openvrml
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/glut/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
diff --git a/p5-Imager/Makefile b/p5-Imager/Makefile
index a77bc7e109b..7ebe51f1576 100644
--- a/p5-Imager/Makefile
+++ b/p5-Imager/Makefile
@@ -24,7 +24,7 @@ PERL5_PACKLIST= 	auto/Imager/.packlist
 .include "../../fonts/t1lib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/libungif/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
diff --git a/panda/Makefile b/panda/Makefile
index 7a0ebced8e1..1f668970bb6 100644
--- a/panda/Makefile
+++ b/panda/Makefile
@@ -27,7 +27,7 @@ post-extract:
 	cp ${FILESDIR}/* ${WRKSRC}/config/
 
 .include "../../graphics/tiff/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../databases/edb/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/paraview/Makefile b/paraview/Makefile
index 84e30666393..aac858b017d 100644
--- a/paraview/Makefile
+++ b/paraview/Makefile
@@ -59,7 +59,7 @@ pre-configure:
 .include "../../audio/faad2/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
diff --git a/py-djvulibre/Makefile b/py-djvulibre/Makefile
index 2646df65dd0..8606d277bd4 100644
--- a/py-djvulibre/Makefile
+++ b/py-djvulibre/Makefile
@@ -25,5 +25,5 @@ PYDISTUTILSPKG=	yes
 .include "../../lang/python/extension.mk"
 .include "../../devel/py-cython/buildlink3.mk"
 .include "../../graphics/djvulibre-lib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/scorched3d/Makefile b/scorched3d/Makefile
index 64af613ed93..e7f914c69e2 100644
--- a/scorched3d/Makefile
+++ b/scorched3d/Makefile
@@ -29,7 +29,7 @@ CONFIGURE_ARGS+=	--with-docdir="${PREFIX}/share/doc/${PKGBASE}"
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../graphics/Mesa/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../math/fftwf/buildlink3.mk"
 .include "../../multimedia/libogg/buildlink3.mk"
diff --git a/slim/Makefile b/slim/Makefile
index 2e6b8e5439a..b6729ae586a 100644
--- a/slim/Makefile
+++ b/slim/Makefile
@@ -71,7 +71,7 @@ do-install:
 .include "../../x11/libXmu/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
 .include "../../x11/libXrender/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
diff --git a/swftools/Makefile b/swftools/Makefile
index 77a7a9ef969..8b577991f4c 100644
--- a/swftools/Makefile
+++ b/swftools/Makefile
@@ -27,7 +27,7 @@ INSTALL_MAKE_FLAGS+=	mandir=${DESTDIR}/${PREFIX}/${PKGMANDIR}
 
 BUILDLINK_INCDIRS.fontconfig=	include/fontconfig
 .include "../../fonts/fontconfig/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/libungif/buildlink3.mk"
 .include "../../multimedia/ming/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/sxemacs/Makefile b/sxemacs/Makefile
index 115f800f6cc..dae7e028c19 100644
--- a/sxemacs/Makefile
+++ b/sxemacs/Makefile
@@ -79,7 +79,7 @@ PLIST_SUBST+=	X11ONLY=""
 .include "../../mk/oss.buildlink3.mk"
 
 .include "../../databases/gdbm/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
diff --git a/synce-kde/Makefile b/synce-kde/Makefile
index 923b60626f1..5efcbaf328d 100644
--- a/synce-kde/Makefile
+++ b/synce-kde/Makefile
@@ -19,7 +19,7 @@ USE_TOOLS+=		gmake
 CONFIGURE_ARGS+=	--with-librra=${PREFIX}
 #ONFIGURE_ARGS+=	--datadir=${PREFIX}/share/kde
 
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../comms/synce-librapi2/buildlink3.mk"
 .include "../../comms/synce-rra/buildlink3.mk"
 .include "../../wip/synce-orange/buildlink3.mk"
diff --git a/synfig/buildlink3.mk b/synfig/buildlink3.mk
index 7d3b6a534e8..c44fa99b4f1 100644
--- a/synfig/buildlink3.mk
+++ b/synfig/buildlink3.mk
@@ -21,7 +21,7 @@ pkgbase:= synfig
 .  endif
 
 .  if !empty(PKG_BUILD_OPTIONS.synfig:Mjpeg)
-.    include "../../graphics/jpeg/buildlink3.mk"
+.    include "../../mk/jpeg.buildlink3.mk"
 .  endif
 
 .  if !empty(PKG_BUILD_OPTIONS.synfig:Mfreetype)
diff --git a/synfig/options.mk b/synfig/options.mk
index 91be5cc4514..967cf1c2288 100644
--- a/synfig/options.mk
+++ b/synfig/options.mk
@@ -32,7 +32,7 @@ PKG_SUGGESTED_OPTIONS=	\
 .endif
 
 .if !empty(PKG_OPTIONS:Mjpeg)
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .endif
 
 .if !empty(PKG_OPTIONS:Mfreetype)
diff --git a/trackballs/Makefile b/trackballs/Makefile
index 2fd9d4c9b1c..8f3f8c10916 100644
--- a/trackballs/Makefile
+++ b/trackballs/Makefile
@@ -32,5 +32,5 @@ SUBST_SED.share=	-e 's|install -D|${INSTALL_DATA:Q}|'
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../graphics/SDL_image/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/twinkle/Makefile b/twinkle/Makefile
index 423c1df9474..609c4050aa6 100644
--- a/twinkle/Makefile
+++ b/twinkle/Makefile
@@ -18,7 +18,7 @@ USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV+=		have_lrelease=${QTDIR}/bin/lrelease
 # for broken jpeg detection
-CONFIGURE_ARGS+=	--with-extra-includes=${BUILDLINK_PREFIX.jpeg}/include
+CONFIGURE_ARGS+=	--with-extra-includes=${JPEGBASE}/include
 CPPFLAGS+=		-I${BUILDLINK_PREFIX.commoncpp2}/include/cc++2
 
 SUBST_CLASSES+=		boost
diff --git a/ubit/Makefile b/ubit/Makefile
index 9ac5d44e690..835e5e20bf4 100644
--- a/ubit/Makefile
+++ b/ubit/Makefile
@@ -24,7 +24,7 @@ USE_LIBTOOL=		yes
 CONFIGURE_ARGS+=	--with-gl-prefix=${LOCALBASE}
 
 .include "../../graphics/libungif/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
diff --git a/uffizi/Makefile b/uffizi/Makefile
index 29598e48b53..ab7d9ed0a6c 100644
--- a/uffizi/Makefile
+++ b/uffizi/Makefile
@@ -30,6 +30,6 @@ do-install:
 
 
 .include 	"../../graphics/ImageMagick/buildlink3.mk"
-.include	"../../graphics/jpeg/buildlink3.mk"
+.include	"../../mk/jpeg.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/vino/Makefile b/vino/Makefile
index 6fd68a245d6..29efd162198 100644
--- a/vino/Makefile
+++ b/vino/Makefile
@@ -31,7 +31,7 @@ GCONF_SCHEMAS=		vino-server.schemas
 .include "../../devel/pango/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../net/libsoup24/buildlink3.mk"
 .include "../../security/gnome-keyring/buildlink3.mk"
diff --git a/vncselector/Makefile b/vncselector/Makefile
index 74e07a08ce8..eda1b846816 100644
--- a/vncselector/Makefile
+++ b/vncselector/Makefile
@@ -16,7 +16,7 @@ USE_LANGUAGES=		c c++ fortran77
 USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake
 
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../x11/fltk/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/vreng/Makefile b/vreng/Makefile
index b8537ad2c1d..357a42aa743 100644
--- a/vreng/Makefile
+++ b/vreng/Makefile
@@ -43,7 +43,7 @@ LIBS.SunOS+=		-R${LOCALBASE}/lib/mysql
 .include "../../graphics/libungif/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/glut/buildlink3.mk"
diff --git a/wine/buildlink3.mk b/wine/buildlink3.mk
index 21c4b68e1ed..e24142765bf 100644
--- a/wine/buildlink3.mk
+++ b/wine/buildlink3.mk
@@ -17,7 +17,7 @@ pkgbase:= wine
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/glut/buildlink3.mk"
 .endif
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/libungif/buildlink3.mk"
 .endif # WINE_BUILDLINK3_MK
 
diff --git a/wine/options.mk b/wine/options.mk
index 8f834e21292..35008ceaf2c 100644
--- a/wine/options.mk
+++ b/wine/options.mk
@@ -46,7 +46,7 @@ CONFIGURE_ARGS+= --without-cups
 PLIST.x11=		yes
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/lcms/buildlink3.mk"
 .include "../../graphics/libungif/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
diff --git a/wings/Makefile b/wings/Makefile
index 7ffbb558c8f..a488c1d5378 100644
--- a/wings/Makefile
+++ b/wings/Makefile
@@ -35,6 +35,6 @@ do-install:
 .include "../../lang/erlang/buildlink3.mk"
 BUILDLINK_API_DEPENDS.erlang+=	erlang>=10
 .include "../../wip/esdl/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wxGTK-contrib-unicode/buildlink3.mk b/wxGTK-contrib-unicode/buildlink3.mk
index 392389aa7be..b8a4912ce65 100644
--- a/wxGTK-contrib-unicode/buildlink3.mk
+++ b/wxGTK-contrib-unicode/buildlink3.mk
@@ -11,7 +11,7 @@ BUILDLINK_PKGSRCDIR.wxGTK-contrib-unicode?=	../../wip/wxGTK-contrib-unicode
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/wxGTK-unicode/Makefile.common b/wxGTK-unicode/Makefile.common
index d4a72620475..a244f07a86b 100644
--- a/wxGTK-unicode/Makefile.common
+++ b/wxGTK-unicode/Makefile.common
@@ -53,7 +53,7 @@ USE_TOOLS+=		gawk:pkgsrc
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/wxGTK-unicode/buildlink3.mk b/wxGTK-unicode/buildlink3.mk
index a663f87515c..b5354aee5a0 100644
--- a/wxGTK-unicode/buildlink3.mk
+++ b/wxGTK-unicode/buildlink3.mk
@@ -14,7 +14,7 @@ BUILDLINK_PKGSRCDIR.wxGTK-unicode?=	../../wip/wxGTK-unicode
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/xbmc/Makefile b/xbmc/Makefile
index c69d2d904a3..ac48b4613cf 100644
--- a/xbmc/Makefile
+++ b/xbmc/Makefile
@@ -74,7 +74,7 @@ pre-configure:
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/glew/buildlink3.mk"
 .include "../../audio/libmad/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../audio/libsamplerate/buildlink3.mk"
 .include "../../databases/mysql5-client/buildlink3.mk"
 .include "../../archivers/lzo/buildlink3.mk"
diff --git a/xmoto/Makefile b/xmoto/Makefile
index 4d356810ff1..e27a808b931 100644
--- a/xmoto/Makefile
+++ b/xmoto/Makefile
@@ -56,7 +56,7 @@ pre-install:
 .include "../../multimedia/smpeg/buildlink3.mk"
 .include "../../wip/ode/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../audio/SDL_mixer/buildlink3.mk"
 .include "../../net/SDL_net/buildlink3.mk"
diff --git a/xulrunner/mozilla-common.mk b/xulrunner/mozilla-common.mk
index 1080e5f9448..72a02687935 100644
--- a/xulrunner/mozilla-common.mk
+++ b/xulrunner/mozilla-common.mk
@@ -87,7 +87,7 @@ BUILDLINK_API_DEPENDS.sqlite3+=	sqlite3>=3.6.23.1nb1
 CONFIGURE_ENV+=	ac_cv_sqlite_secure_delete=yes	# c.f. patches/patch-al
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../net/libIDL/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.18.3nb1
diff --git a/yafray/Makefile b/yafray/Makefile
index 60e3e6ad06e..a18fe2eaedc 100644
--- a/yafray/Makefile
+++ b/yafray/Makefile
@@ -32,7 +32,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/loader/.libs/yafray ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/src/yafraycore/.libs/libyafraycore.so ${PREFIX}/lib
 
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/zapping/Makefile b/zapping/Makefile
index a5785c80e20..95e733298a4 100644
--- a/zapping/Makefile
+++ b/zapping/Makefile
@@ -28,7 +28,7 @@ GCONF_SCHEMAS+=	zapping.schemas
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../lang/python/extension.mk"
 .include "../../mk/omf-scrollkeeper.mk"