diff --git a/media-gfx/qrencode/qrencode-3.4.4.recipe b/media-gfx/qrencode/qrencode-4.1.1.recipe
similarity index 53%
rename from media-gfx/qrencode/qrencode-3.4.4.recipe
rename to media-gfx/qrencode/qrencode-4.1.1.recipe
index 155a5ba02..ff12b1ac3 100644
--- a/media-gfx/qrencode/qrencode-3.4.4.recipe
+++ b/media-gfx/qrencode/qrencode-4.1.1.recipe
@@ -10,52 +10,81 @@ file, using libqrencode allows applications to render QR Code symbols from raw \
 bitmap data directly. This library also contains a command-line utility to \
 output a QR Code symbol as PNG image. This helps light-weight CGI programs."
 HOMEPAGE="https://fukuchi.org/works/qrencode/"
-COPYRIGHT="2006-2014 Kentaro Fukuchi
+COPYRIGHT="2006-2020 Kentaro Fukuchi
 	2002, 2003, 2004, 2006 Phil Karn, KA9Q (Reed-Solomon code encoder)"
 LICENSE="GNU LGPL v2.1"
-REVISION="3"
-SOURCE_URI="https://fukuchi.org/works/qrencode/qrencode-$portVersion.tar.gz"
-CHECKSUM_SHA256="e794e26a96019013c0e3665cb06b18992668f352c5553d0a553f5d144f7f2a72"
+REVISION="1"
+SOURCE_URI="https://fukuchi.org/works/qrencode/qrencode-$portVersion.tar.bz2"
+CHECKSUM_SHA256="e455d9732f8041cf5b9c388e345a641fd15707860f928e94507b1961256a6923"
 
 ARCHITECTURES="all ?arm ?ppc"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
+commandBinDir=$binDir
+commandSuffix=$secondaryArchSuffix
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
+
+libVersion="$portVersion"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
 	qrencode$secondaryArchSuffix = $portVersion
-	cmd:qrencode$secondaryArchSuffix = $portVersion
-	lib:libqrencode$secondaryArchSuffix = 3.4.4 compat >= 3
+	lib:libqrencode$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libpng16$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
-	qrencode${secondaryArchSuffix}_devel = $portVersion compat >= 3
-	devel:libqrencode$secondaryArchSuffix = 3.4.4 compat >= 3
+	qrencode${secondaryArchSuffix}_devel = $portVersion
+	devel:libqrencode$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
-	qrencode$secondaryArchSuffix == $portVersion
+	qrencode$secondaryArchSuffix == $portVersion base
+	"
+
+PROVIDES_tools="
+	qrencode${secondaryArchSuffix}_tools = $portVersion
+	cmd:qrencode$commandSuffix = $portVersion
+	"
+REQUIRES_tools="
+	qrencode$secondaryArchSuffix == $portVersion base
+	haiku$secondaryArchSuffix
+	lib:libpng16$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libpng16$secondaryArchSuffix
-	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
+	cmd:aclocal
 	cmd:awk
+	cmd:autoconf
+	cmd:automake
+	cmd:autoheader
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
+	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
 	cmd:sed
 	"
 
+defineDebugInfoPackage qrencode$secondaryArchSuffix \
+	$libDir/libqrencode.so.$libVersion \
+	"$(getPackagePrefix tools)"/bin/qrencode
+
 BUILD()
 {
-	runConfigure ./configure --enable-static
+	./autogen.sh
+	runConfigure --omit-dirs binDir ./configure \
+		--bindir=$commandBinDir \
+		--disable-static
 	make $jobArgs
 }
 
@@ -63,12 +92,17 @@ INSTALL()
 {
 	make install
 
-	rm $libDir/libqrencode.la
+	# remove libtool file
+	rm -f $libDir/libqrencode.la
 
-	prepareInstalledDevelLibs libqrencode
+	prepareInstalledDevelLib libqrencode
 	fixPkgconfig
 
 	# devel package
 	packageEntries devel \
 		$developDir
+
+	packageEntries tools \
+		$commandBinDir \
+		$documentationDir
 }