diff --git a/protobuf.spec b/protobuf.spec
index 409c014..06d9f1d 100644
--- a/protobuf.spec
+++ b/protobuf.spec
@@ -89,9 +89,10 @@ RPC protocols and file formats.
 %package compiler
 Summary:        Protocol Buffers compiler
 Group:          Development/Libraries/C and C++
+Conflicts:      protobuf2-devel
+Conflicts:      protobuf21-devel
 Provides:       protobuf-devel:/usr/bin/protoc
 Provides:       protoc = %{version}
-Conflicts:      mvn(com.google.protobuf:protobuf-java) < 4.%{version}
 
 %description compiler
 Protocol Buffers are a way of encoding structured data in an efficient yet
diff --git a/python_edition_defaults.py b/python_edition_defaults.py
new file mode 100644
index 0000000..473a0f4