diff --git a/programming/language/java/java-openjdk/comar/jdk_package.py b/programming/language/java/java-openjdk/comar/jdk_package.py
index 1f5ab74dff..1729589a8d 100644
--- a/programming/language/java/java-openjdk/comar/jdk_package.py
+++ b/programming/language/java/java-openjdk/comar/jdk_package.py
@@ -10,7 +10,7 @@ executables = (
     'jlink', 'jimage', 'jdeps'
 )
 bin_dir = '/usr/bin'
-jvm_dir = '/usr/lib/jvm/java-13-openjdk'
+jvm_dir = '/usr/lib/jvm/java-openjdk'
 
 
 def postInstall(fromVersion, fromRelease, toVersion, toRelease):
diff --git a/programming/language/java/java-openjdk/comar/jre_package.py b/programming/language/java/java-openjdk/comar/jre_package.py
index 8915889f64..97f78bc280 100644
--- a/programming/language/java/java-openjdk/comar/jre_package.py
+++ b/programming/language/java/java-openjdk/comar/jre_package.py
@@ -8,7 +8,7 @@ executables = (
     'jaotc', 'java', 'jfr', 'jjs', 'jrunscript', 'keytool', 'pack200', 'rmid', 'rmiregistry', 'unpack200'
 )
 bin_dir = '/usr/bin'
-jvm_dir = '/usr/lib/jvm/java-13-openjdk'
+jvm_dir = '/usr/lib/jvm/java-openjdk'
 
 
 def postInstall(fromVersion, fromRelease, toVersion, toRelease):
diff --git a/programming/language/java/java-openjdk/pspec.xml b/programming/language/java/java-openjdk/pspec.xml
index 1295f994f4..e4ee9a2574 100644
--- a/programming/language/java/java-openjdk/pspec.xml
+++ b/programming/language/java/java-openjdk/pspec.xml
@@ -31,7 +31,7 @@
             <Dependency>libpng-devel</Dependency>
             <Dependency>lcms2-devel</Dependency>
             <Dependency>fontconfig-devel</Dependency>
-			<Dependency>jdk-openjdk</Dependency>
+	    <Dependency>jdk-openjdk</Dependency>
         </BuildDependencies>
     </Source>