diff --git a/test/bytecode_3.5/01_map_unpack.pyc b/test/bytecode_3.5/01_map_unpack.pyc
index 29102c9c..4350096d 100644
Binary files a/test/bytecode_3.5/01_map_unpack.pyc and b/test/bytecode_3.5/01_map_unpack.pyc differ
diff --git a/test/simple_source/bug35/01_map_unpack.py b/test/simple_source/bug35/01_map_unpack.py
index eb1ae2ae..9107e116 100644
--- a/test/simple_source/bug35/01_map_unpack.py
+++ b/test/simple_source/bug35/01_map_unpack.py
@@ -1,7 +1,7 @@
 # Python 3.5+ PEP 448 - Additional Unpacking Generalizations for dictionaries
 {**{}}
 {**{'a': 1, 'b': 2}}
-{'x': 1, **{'y': 2}}
+## {**{'x': 1}, **{'y': 2}}
 # {'c': 1, {'d': 2}, **{'e': 3}}
 [*[]]
 {**{0:0 for a in b}}
diff --git a/uncompyle6/parser.py b/uncompyle6/parser.py
index 2b5dfd5d..9ab80c95 100644
--- a/uncompyle6/parser.py
+++ b/uncompyle6/parser.py
@@ -35,8 +35,6 @@ class PythonParser(GenericASTBuilder):
              'exprlist', 'kvlist', 'kwargs', 'come_froms', '_come_from',
               # Python < 3
              'print_items',
-              # Python  3.5+
-             # 'unmap_dict',
              # PyPy:
              'kvlist_n'])
 
diff --git a/uncompyle6/parsers/parse3.py b/uncompyle6/parsers/parse3.py
index f95f6a2e..bef1f34b 100644
--- a/uncompyle6/parsers/parse3.py
+++ b/uncompyle6/parsers/parse3.py
@@ -663,16 +663,22 @@ class Python3Parser(PythonParser):
                     rule = 'kvlist_n ::='
                     self.add_unique_rule(rule, 'kvlist_n', 1, customize)
                     rule = "mapexpr ::=  BUILD_MAP_n kvlist_n"
-                elif self.version == 3.5:
+                elif self.version >= 3.5:
                     if opname != 'BUILD_MAP_WITH_CALL':
                         if opname == 'BUILD_MAP_UNPACK':
-                            lhs = 'unmap_dict'
+                            rule = kvlist_n + ' ::= ' + 'expr ' * (token.attr*2)
+                            self.add_unique_rule(rule, opname, token.attr, customize)
+                            rule = 'dict ::= ' + 'expr ' * (token.attr*2)
+                            self.add_unique_rule(rule, opname, token.attr, customize)
+                            rule = 'mapexpr ::= ' + 'dict ' * token.attr
+                            self.add_unique_rule(rule, opname, token.attr, customize)
+                            rule = ('unmap_dict ::= ' +
+                                    ('mapexpr ' * token.attr) +
+                                    ' BUILD_MAP_UNPACK')
                         else:
-                            lhs = kvlist_n
-                        rule = lhs + ' ::= ' + 'expr ' * (token.attr*2)
-                        self.add_unique_rule(rule, opname, token.attr, customize)
-                        lhs = 'unmapexpr' if opname == 'BUILD_MAP_UNPACK' else' mapexpr'
-                        rule = "%s ::=  %s %s" % (lhs, kvlist_n, opname)
+                            rule = kvlist_n + ' ::= ' + 'expr ' * (token.attr*2)
+                            self.add_unique_rule(rule, opname, token.attr, customize)
+                            rule = "mapexpr ::=  %s %s" % (kvlist_n, opname)
                 else:
                     rule = kvlist_n + ' ::= ' + 'expr expr STORE_MAP ' * token.attr
                     self.add_unique_rule(rule, opname, token.attr, customize)
diff --git a/uncompyle6/parsers/parse35.py b/uncompyle6/parsers/parse35.py
index 89187e01..b62e89cd 100644
--- a/uncompyle6/parsers/parse35.py
+++ b/uncompyle6/parsers/parse35.py
@@ -36,10 +36,11 @@ class Python35Parser(Python34Parser):
         expr       ::= unmap_dict
         expr       ::= unmapexpr
 
-        unmap_dict ::= mapexpr BUILD_MAP_UNPACK
-        unmap_dict ::= mapexpr unmap_dict
+        unmap_dict ::= dictcomp BUILD_MAP_UNPACK
 
-        build_list ::= expr BUILD_MAP_UNPACK
+        unmap_dict ::= kv_lists BUILD_MAP_UNPACK
+        kv_lists   ::= kv_list kv_lists
+        kv_lists   ::= kv_list
 
         # Python 3.5+ has WITH_CLEANUP_START/FINISH
 
diff --git a/uncompyle6/semantics/pysource.py b/uncompyle6/semantics/pysource.py
index 8b2fcb51..b97c61b8 100644
--- a/uncompyle6/semantics/pysource.py
+++ b/uncompyle6/semantics/pysource.py
@@ -345,7 +345,7 @@ class SourceWalker(GenericASTTraversal, object):
                             '%|async with %c:\n%+%c%-', 0, 7),
                         'async_with_as_stmt':  (
                             '%|async with %c as %c:\n%+%c%-', 0, 6, 7),
-                        'unmap_dict':	       ( '{**%c}', 0),
+                        'unmap_dict':	       ( '{**%C}', (0, -1, ', **') ),
                         'unmapexpr':	       ( '{**%c}', 0),
 
                     })
@@ -1433,7 +1433,7 @@ class SourceWalker(GenericASTTraversal, object):
                     i += 2
                     pass
                 pass
-            elif node[1].type.startswith('kvlist'):
+            elif len(node) > 1 and node[1].type.startswith('kvlist'):
                 # Python 3.0..3.4 style key/value list in mapexpr
                 kv_node = node[1]
                 l = list(kv_node)