diff --git a/tools/filenamer.py b/tools/filenamer.py
index 51c42f9a..be62362e 100755
--- a/tools/filenamer.py
+++ b/tools/filenamer.py
@@ -16,18 +16,11 @@ ops = ap.parse_args()
 manifest = json.load(open(ops.manifest))
 versions = manifest['version']
 versions['UARCH'] = manifest['arch'].upper().replace("POWERPC","PPC")
-
+versions['OS_RELEASE_VERSION_ID'] = manifest['os-release']['VERSION_ID']
 
 if ops.type == 'swi':
-    print "%(FNAME_PRODUCT_VERSION)s_ONL-OS_%(FNAME_BUILD_ID)s_%(UARCH)s.swi" % versions
+    print "%(FNAME_PRODUCT_VERSION)s_ONL-OS%(OS_RELEASE_VERSION_ID)s_%(FNAME_BUILD_ID)s_%(UARCH)s.swi" % versions
 elif ops.type == 'installer':
-    print "%(FNAME_PRODUCT_VERSION)s_ONL-OS_%(FNAME_BUILD_ID)s_%(UARCH)s_INSTALLER" % versions
+    print "%(FNAME_PRODUCT_VERSION)s_ONL-OS%(OS_RELEASE_VERSION_ID)s_%(FNAME_BUILD_ID)s_%(UARCH)s_INSTALLER" % versions
 else:
     raise ValueError("Unknown type '%s'" % ops.type)
-
-
-
-
-
-
-