diff --git a/build/jam/ArchitectureRules b/build/jam/ArchitectureRules
index b1e9233d6d..9348055d2c 100644
--- a/build/jam/ArchitectureRules
+++ b/build/jam/ArchitectureRules
@@ -602,7 +602,7 @@ rule ArchitectureSetupWarnings architecture
 	EnableWerror src add-ons translators hvif ;
 	EnableWerror src add-ons translators ico ;
 	EnableWerror src add-ons translators jpeg ;
-	EnableWerror src add-ons translators jpeg2000 ;
+#	EnableWerror src add-ons translators jpeg2000 ;
 	EnableWerror src add-ons translators pcx ;
 	EnableWerror src add-ons translators png ;
 	EnableWerror src add-ons translators ppm ;
diff --git a/build/jam/BuildFeatures b/build/jam/BuildFeatures
index 28498c1d1d..8b299308aa 100644
--- a/build/jam/BuildFeatures
+++ b/build/jam/BuildFeatures
@@ -440,25 +440,15 @@ if [ IsPackageAvailable libicns_devel ] {
 
 # Jasper
 if [ IsPackageAvailable jasper_devel ] {
-	if $(HAIKU_PACKAGING_ARCH) = x86_64 {
-		ExtractBuildFeatureArchives jasper :
-			file: base jasper
-				runtime: lib
-			file: devel jasper_devel
-				depends: base
-				library: $(developLibDir)/libjasper.so.4
-				headers: $(developHeadersDir) $(developHeadersDir)/jasper
-			;
-	} else {
-		ExtractBuildFeatureArchives jasper :
-			file: base jasper
-				runtime: lib
-			file: devel jasper_devel
-				depends: base
-				library: $(developLibDir)/libjasper.so.1
-				headers: $(developHeadersDir) $(developHeadersDir)/jasper
-			;
-	}
+	ExtractBuildFeatureArchives jasper :
+		file: base jasper
+			runtime: lib
+		file: devel jasper_devel
+			depends: base
+			library: $(developLibDir)/libjasper.so.4
+			headers: $(developHeadersDir) $(developHeadersDir)/jasper
+		;
+
 	EnableBuildFeatures jasper ;
 } else {
 	Echo "Jasper support not available on $(TARGET_PACKAGING_ARCH)" ;
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 9fb678150b..bbd6371898 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -87,7 +87,7 @@ if [ IsOptionalHaikuImagePackageAdded Bluetooth ] {
 # Development
 if [ IsOptionalHaikuImagePackageAdded Development ] {
 	# auto tools and perl
-	AddHaikuImagePackages autoconf automake libtool perl texinfo ;
+	AddHaikuImagePackages autoconf automake perl texinfo ;
 
 	# some other build tools
 	AddHaikuImagePackages pkgconfig scons ;
@@ -149,12 +149,6 @@ if [ IsOptionalHaikuImagePackageAdded FFMpeg-devel ] {
 # Git
 if [ IsOptionalHaikuImagePackageAdded Git ] {
 	AddHaikuImagePackages git git_arch git_daemon git_email git_svn ;
-
-	# git_cvs depends on cvsps, which does not build with gcc2. So it is not
-	# available on gcc2-only builds.
-	if $(TARGET_PACKAGING_ARCHS) != x86_gcc2 {
-		AddHaikuImagePackages git_cvs ;
-	}
 }
 
 
diff --git a/build/jam/RepositoryRules b/build/jam/RepositoryRules
index 17f6d94841..37e4a18443 100644
--- a/build/jam/RepositoryRules
+++ b/build/jam/RepositoryRules
@@ -160,9 +160,12 @@ rule RemotePackageRepository repository : architecture : repositoryUrl
 	# build package list checksum file
 	local packagesChecksumFile
 		= $(repository:G=repository-package-checksum)-checksum ;
+	local thisPackageRepositoryFile = [ Glob [ FDirName
+		$(HAIKU_BUILD_RULES_DIR) repositories HaikuPorts ] :
+			$(HAIKU_PACKAGING_ARCH) ] ;
 	MakeLocate $(packagesChecksumFile) : $(repositoriesDir) ;
-	Depends $(packagesChecksumFile) : $(packageListFile) ;
-	ChecksumFileSHA256 $(packagesChecksumFile) : $(packageListFile) ;
+	Depends $(packagesChecksumFile) : $(thisPackageRepositoryFile) ;
+	ChecksumFileSHA256 $(packagesChecksumFile) : $(thisPackageRepositoryFile) ;
 
 	local repositoryInfo = $(repository:G=repository-info)-info ;
 	local repositoryFile = $(repository:G=repository-cache) ;
@@ -260,7 +263,7 @@ actions RepositoryConfig1
 		version=`cat "$(2[3]:E)"`
 	fi
 	$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)
-	$(2[1]) $(HAIKU_REPOSITORY_URL) $(2[2]) $(1)
+	$(2[1]) $(2[2]) $(1)
 }
 
 
diff --git a/build/jam/images/definitions/regular b/build/jam/images/definitions/regular
index f3def0e213..44faa103db 100644
--- a/build/jam/images/definitions/regular
+++ b/build/jam/images/definitions/regular
@@ -90,7 +90,6 @@ rule HaikuImageGetPrivateSystemLibs
 {
 	return [ MultiArchDefaultGristFiles [ FFilterByBuildFeatures
 		libalm.so
-		libfluidsynth.so@gcc2
 		libilmimf.so
 		libpackage-add-on-libsolv.so
 		libroot-addon-icu.so
diff --git a/src/add-ons/translators/jpeg2000/JPEG2000Translator.h b/src/add-ons/translators/jpeg2000/JPEG2000Translator.h
index 204d9ebd41..6f72e0a61b 100644
--- a/src/add-ons/translators/jpeg2000/JPEG2000Translator.h
+++ b/src/add-ons/translators/jpeg2000/JPEG2000Translator.h
@@ -52,6 +52,9 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "BaseTranslator.h"
 #include "jasper/jasper.h"
 
+// jasper includes stdbool
+#undef bool
+
 
 #undef B_TRANSLATION_CONTEXT
 #define B_TRANSLATION_CONTEXT "JPEG2000Translator"
@@ -135,11 +138,11 @@ public:
 	virtual status_t DerivedIdentify(BPositionIO* inSource,
 		const translation_format* inFormat, BMessage* ioExtension,
 		translator_info* outInfo, uint32 outType);
-		
+
 	virtual status_t DerivedTranslate(BPositionIO* inSource,
 		const translator_info* inInfo, BMessage* ioExtension,
 		uint32 outType, BPositionIO* outDestination, int32 baseType);
-		
+
 	virtual BView* NewConfigView(TranslatorSettings* settings);
 
 
diff --git a/src/data/package_infos/x86/haiku b/src/data/package_infos/x86/haiku
index 95fcd6525e..b40172069c 100644
--- a/src/data/package_infos/x86/haiku
+++ b/src/data/package_infos/x86/haiku
@@ -93,7 +93,6 @@ requires {
 #ifdef HAIKU_BUILD_FEATURE_X86_LIBPNG_ENABLED
 	lib:libpng >= 16.0
 #endif
-	lib:libqrencode
 #ifdef HAIKU_BUILD_FEATURE_X86_TIFF_ENABLED
 	lib:libtiff >= 5.2
 #endif
diff --git a/src/data/package_infos/x86_64/haiku b/src/data/package_infos/x86_64/haiku
index 83f5c516c8..3c8f627248 100644
--- a/src/data/package_infos/x86_64/haiku
+++ b/src/data/package_infos/x86_64/haiku
@@ -92,7 +92,6 @@ requires {
 #ifdef HAIKU_BUILD_FEATURE_X86_64_LIBPNG_ENABLED
 	lib:libpng >= 16.0
 #endif
-	lib:libqrencode
 #ifdef HAIKU_BUILD_FEATURE_X86_64_TIFF_ENABLED
 	lib:libtiff >= 5.2
 #endif
diff --git a/src/data/package_infos/x86_gcc2/haiku b/src/data/package_infos/x86_gcc2/haiku
index 492d1069fa..bab31fb7bf 100644
--- a/src/data/package_infos/x86_gcc2/haiku
+++ b/src/data/package_infos/x86_gcc2/haiku
@@ -93,7 +93,6 @@ requires {
 #ifdef HAIKU_BUILD_FEATURE_X86_GCC2_LIBPNG_ENABLED
 	lib:libpng16 >= 16.0
 #endif
-	lib:libqrencode
 #ifdef HAIKU_BUILD_FEATURE_X86_GCC2_TIFF_ENABLED
 	lib:libtiff >= 5.2
 #endif
diff --git a/src/libs/Jamfile b/src/libs/Jamfile
index a36f334ef8..2b1e6639d6 100644
--- a/src/libs/Jamfile
+++ b/src/libs/Jamfile
@@ -4,7 +4,6 @@ SubInclude HAIKU_TOP src libs agg ;
 SubInclude HAIKU_TOP src libs alm ;
 SubInclude HAIKU_TOP src libs bsd ;
 SubInclude HAIKU_TOP src libs compat ;
-SubInclude HAIKU_TOP src libs fluidsynth ;
 SubInclude HAIKU_TOP src libs glut ;
 SubInclude HAIKU_TOP src libs gnu ;
 SubInclude HAIKU_TOP src libs icon ;
@@ -20,4 +19,3 @@ SubInclude HAIKU_TOP src libs termcap ;
 SubInclude HAIKU_TOP src libs udis86 ;
 SubInclude HAIKU_TOP src libs uuid ;
 SubInclude HAIKU_TOP src libs util ;
-
diff --git a/src/preferences/repositories/constants.h b/src/preferences/repositories/constants.h
index a565eb1eea..3acaa71257 100644
--- a/src/preferences/repositories/constants.h
+++ b/src/preferences/repositories/constants.h
@@ -38,7 +38,7 @@ typedef struct {
 static const Repository kDefaultRepos[] = {
 	{ "Haiku", "https://packages.haiku-os.org/haiku/master/" B_HAIKU_ABI_NAME
 		"/current"},
-	{ "HaikuPorts", "https://packages.haiku-os.org/haikuports/master/repo/"
+	{ "HaikuPorts", "https://eu.hpkg.haiku-os.org/haikuports/master/repository/"
 		B_HAIKU_ABI_NAME "/current" }
 };