diff --git a/protob/Makefile b/protob/Makefile
index a0d53c0c6..9956d448f 100644
--- a/protob/Makefile
+++ b/protob/Makefile
@@ -1,4 +1,4 @@
-all: messages.pb storage.pb types.pb
+check: config.pb messages.pb storage.pb types.pb
 
 %.pb: %.proto
 	protoc -I/usr/include -I. $< -o $@
diff --git a/protob/messages.proto b/protob/messages.proto
index 14bbe1391..ac116b5be 100644
--- a/protob/messages.proto
+++ b/protob/messages.proto
@@ -5,8 +5,8 @@
  * @version	0.6
  */
 
-// Sugar for easier handling in Multibit
-option java_package = "org.multibit.hd.hardware.trezor.protobuf";
+// Sugar for easier handling in Java
+option java_package = "com.satoshilabs.trezor.protobuf";
 option java_outer_classname = "TrezorMessage";
 
 import "types.proto";
diff --git a/protob/storage.proto b/protob/storage.proto
index 2b37ea1e2..1eb97f977 100644
--- a/protob/storage.proto
+++ b/protob/storage.proto
@@ -5,8 +5,8 @@
  * @version	1
  */
 
-// Sugar for easier handling in Multibit
-option java_package = "org.multibit.hd.hardware.trezor.protobuf";
+// Sugar for easier handling in Java
+option java_package = "com.satoshilabs.trezor.protobuf";
 option java_outer_classname = "TrezorStorage";
 
 import "types.proto";
diff --git a/protob/types.proto b/protob/types.proto
index 190bcb435..23f47f5be 100644
--- a/protob/types.proto
+++ b/protob/types.proto
@@ -5,8 +5,8 @@
  * @version	0.6
  */
 
-// Sugar for easier handling in Multibit
-option java_package = "org.multibit.hd.hardware.trezor.protobuf";
+// Sugar for easier handling in Java
+option java_package = "com.satoshilabs.trezor.protobuf";
 option java_outer_classname = "TrezorType";
 
 import "google/protobuf/descriptor.proto";