diff --git a/build/jam/ArchitectureRules b/build/jam/ArchitectureRules
index 375e0c44ed..d2a12fd824 100644
--- a/build/jam/ArchitectureRules
+++ b/build/jam/ArchitectureRules
@@ -669,6 +669,7 @@ rule ArchitectureSetupWarnings architecture
 	EnableWerror src add-ons translators tiff ;
 #	EnableWerror src add-ons translators wonderbrush ;
 	EnableWerror src add-ons print ;
+	EnableWerror src bin desklink ;
 	EnableWerror src bin multiuser ;
 	EnableWerror src bin package ;
 	EnableWerror src bin package_repo ;
diff --git a/src/bin/desklink/VolumeControl.cpp b/src/bin/desklink/VolumeControl.cpp
index 8e780702f2..8983830885 100644
--- a/src/bin/desklink/VolumeControl.cpp
+++ b/src/bin/desklink/VolumeControl.cpp
@@ -395,7 +395,7 @@ VolumeControl::UpdateText() const
 	if (!IsEnabled())
 		return NULL;
 
-	fText.SetToFormat(B_TRANSLATE("%ld dB"), Value());
+	fText.SetToFormat(B_TRANSLATE("%" B_PRId32 " dB"), Value());
 	return fText.String();
 }
 
diff --git a/src/bin/desklink/desklink.cpp b/src/bin/desklink/desklink.cpp
index 0dd4030f85..89d39cf83f 100644
--- a/src/bin/desklink/desklink.cpp
+++ b/src/bin/desklink/desklink.cpp
@@ -55,7 +55,7 @@ main(int, char **argv)
 			while (found < count) {
 				const char *name = NULL;
 				if (deskbar.GetItemInfo(j, &name) == B_OK) {
-					printf("Item %ld: '%s'\n", j, name);
+					printf("Item %" B_PRId32 ": '%s'\n", j, name);
 					free((void *)name);
 					found++;
 				}
@@ -95,13 +95,13 @@ main(int, char **argv)
 			while (deskbar.GetItemInfo(replicant.String(), &found_id) == B_OK) {
 				err = deskbar.RemoveItem(found_id);
 				if (err != B_OK) {
-					printf("desklink: Error removing replicant id %ld: %s\n",
-						found_id, strerror(err));
+					printf("desklink: Error removing replicant id "
+						"%" B_PRId32 ": %s\n", found_id, strerror(err));
 					break;
 				}
 				found++;
 			}
-			printf("Removed %ld items.\n", found);
+			printf("Removed %" B_PRId32 " items.\n", found);
 			return err;
 		}