diff --git a/llvm/llvm.spec.in b/llvm/llvm.spec.in
index d4ef08ae5ad3..d07864581f10 100644
--- a/llvm/llvm.spec.in
+++ b/llvm/llvm.spec.in
@@ -2,7 +2,7 @@ Name: @PACKAGE_NAME@
 Version: @PACKAGE_VERSION@
 Release: 0
 Summary: LLVM (An Optimizing Compiler Infrastructure)
-License: University of Illinois/NCSA Open Source License
+License: Apache-2.0 with LLVM exception
 Vendor: None (open source)
 Group: Development/Compilers
 URL: http://llvm..org/
diff --git a/llvm/utils/lit/setup.py b/llvm/utils/lit/setup.py
index 10de6bb4ee79..b27ed26e24a6 100644
--- a/llvm/utils/lit/setup.py
+++ b/llvm/utils/lit/setup.py
@@ -16,7 +16,7 @@ setup(
     author = lit.__author__,
     author_email = lit.__email__,
     url = 'http://llvm.org',
-    license = 'BSD',
+    license = 'Apache-2.0 with LLVM exception',
 
     description = "A Software Testing Tool",
     keywords = 'test C++ automatic discovery',
@@ -60,7 +60,7 @@ http://llvm.org/svn/llvm-project/llvm/trunk/utils/lit.
         'Development Status :: 3 - Alpha',
         'Environment :: Console',
         'Intended Audience :: Developers',
-        'License :: OSI Approved :: University of Illinois/NCSA Open Source License',
+        'License :: OSI Approved :: Apache-2.0 with LLVM exception',
         'Natural Language :: English',
         'Operating System :: OS Independent',
         'Programming Language :: Python',