diff --git a/workspace_tools/export/__init__.py b/workspace_tools/export/__init__.py
index 1fff1d8e799..1b4cd197ba3 100755
--- a/workspace_tools/export/__init__.py
+++ b/workspace_tools/export/__init__.py
@@ -20,7 +20,7 @@
 import yaml
 
 from workspace_tools.utils import mkdir
-from workspace_tools.export import uvision4, codered, gccarm, ds5_5, iar, emblocks, coide, kds, zip, simplicityv3, atmelstudio, sw4stm32, e2studio
+from workspace_tools.export import uvision4, uvision5, codered, gccarm, ds5_5, iar, emblocks, coide, kds, zip, simplicityv3, atmelstudio, sw4stm32, e2studio
 from workspace_tools.export.exporters import zip_working_directory_and_clean_up, OldLibrariesException
 from workspace_tools.targets import TARGET_NAMES, EXPORT_MAP, TARGET_MAP
 
@@ -28,6 +28,7 @@
 
 EXPORTERS = {
     'uvision': uvision4.Uvision4,
+    'uvision5': uvision5.Uvision5,
     'lpcxpresso': codered.CodeRed,
     'gcc_arm': gccarm.GccArm,
     'ds5_5': ds5_5.DS5_5,
diff --git a/workspace_tools/export/uvision5.py b/workspace_tools/export/uvision5.py
new file mode 100644
index 00000000000..c379567b333
--- /dev/null
+++ b/workspace_tools/export/uvision5.py
@@ -0,0 +1,77 @@
+"""
+mbed SDK
+Copyright (c) 2016 ARM Limited
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
+from os.path import basename, join, dirname
+from project_generator_definitions.definitions import ProGenDef
+
+from workspace_tools.export.exporters import Exporter
+from workspace_tools.targets import TARGET_MAP, TARGET_NAMES
+
+# If you wish to add a new target, add it to project_generator_definitions, and then
+# define progen_target name in the target class (`` self.progen_target = 'my_target_name' ``)
+# There are 2 default mbed templates (predefined settings) uvision.uvproj and uvproj_microlib.uvproj.tmpl
+class Uvision5(Exporter):
+    """
+    Exporter class for uvision5. This class uses project generator.
+    """
+    # These 2 are currently for exporters backward compatiblity
+    NAME = 'uVision5'
+    TOOLCHAIN = 'ARM'
+    # PROGEN_ACTIVE contains information for exporter scripts that this is using progen
+    PROGEN_ACTIVE = True
+
+    # backward compatibility with our scripts
+    TARGETS = []
+    for target in TARGET_NAMES:
+        try:
+            if (ProGenDef('uvision5').is_supported(str(TARGET_MAP[target])) or
+                ProGenDef('uvision5').is_supported(TARGET_MAP[target].progen['target'])):
+                TARGETS.append(target)
+        except AttributeError:
+            # target is not supported yet
+            continue
+
+
+    def generate(self):
+        """ Generates the project files """
+        project_data = self.progen_get_project_data()
+        tool_specific = {}
+        # Expand tool specific settings by uvision specific settings which are required
+        try:
+            if TARGET_MAP[self.target].progen['uvision5']['template']:
+                tool_specific['uvision5'] = TARGET_MAP[self.target].progen['uvision5']
+        except KeyError:
+            # use default template
+            # by the mbed projects
+            tool_specific['uvision5'] = {
+                    'template': [join(dirname(__file__),  'uvision.uvproj.tmpl')],
+            }
+
+        project_data['tool_specific'] = {}
+        project_data['tool_specific'].update(tool_specific)
+        i = 0
+        for macro in project_data['common']['macros']:
+            # armasm does not like floating numbers in macros, timestamp to int
+            if macro.startswith('MBED_BUILD_TIMESTAMP'):
+                timestamp = macro[len('MBED_BUILD_TIMESTAMP='):]
+                project_data['common']['macros'][i] = 'MBED_BUILD_TIMESTAMP=' + str(int(float(timestamp)))
+            # armasm does not even accept MACRO=string
+            if macro.startswith('MBED_USERNAME'):
+                project_data['common']['macros'].pop(i)
+            i += 1
+        project_data['common']['macros'].append('__ASSERT_MSG')
+        self.progen_gen_file('uvision5', project_data)
+