diff --git a/src/Mod/Arch/ArchServer.py b/src/Mod/Arch/ArchServer.py
index d81dba7420e6..bdd105408853 100644
--- a/src/Mod/Arch/ArchServer.py
+++ b/src/Mod/Arch/ArchServer.py
@@ -86,6 +86,7 @@ def Activated(self):
         if not pushOK:
             d.checkBox.setChecked(False)
             d.checkBox.setEnabled(False)
+        d.label.setText(str(len(modified_files)+len(untracked_files))+" modified file(s)")
         d.lineEdit.setText("Changed " + os.path.basename(f))
         r = d.exec_()
         if r:
@@ -103,12 +104,17 @@ class _ArchGitDialog(QtGui.QDialog):
     def __init__(self):
         QtGui.QDialog.__init__(self)
         self.setObjectName("ArchGitOptions")
-        self.resize(365, 181)
+        self.resize(370, 200)
         self.verticalLayout = QtGui.QVBoxLayout(self)
         self.verticalLayout.setObjectName("verticalLayout")
         self.groupBox = QtGui.QGroupBox(self)
         self.groupBox.setObjectName("groupBox")
-        self.horizontalLayout = QtGui.QHBoxLayout(self.groupBox)
+        self.vl3 = QtGui.QVBoxLayout(self.groupBox)
+        self.vl3.setObjectName("vl3")
+        self.label = QtGui.QLabel(self.groupBox)
+        self.label.setObjectName("label")
+        self.vl3.addWidget(self.label)
+        self.horizontalLayout = QtGui.QHBoxLayout(self.vl3)
         self.horizontalLayout.setObjectName("horizontalLayout")
         self.radioButton_2 = QtGui.QRadioButton(self.groupBox)
         self.radioButton_2.setChecked(True)
diff --git a/src/Mod/Arch/ArchSpace.py b/src/Mod/Arch/ArchSpace.py
index b71fc2d3737e..5733e9360283 100644
--- a/src/Mod/Arch/ArchSpace.py
+++ b/src/Mod/Arch/ArchSpace.py
@@ -29,6 +29,118 @@
 
 Roles = ["Space"]
 
+SpaceTypes = [
+"Undefined",
+"Exterior",
+"Exterior - Terrace",
+"Office",
+"Office - Enclosed",
+"Office - Open Plan",
+"Conference / Meeting / Multipurpose",
+"Classroom / Lecture / Training For Penitentiary",
+"Lobby",
+"Lobby - For Hotel",
+"Lobby - For Performing Arts Theater",
+"Lobby - For Motion Picture Theater",
+"Audience/Seating Area",
+"Audience/Seating Area - For Gymnasium",
+"Audience/Seating Area - For Exercise Center",
+"Audience/Seating Area - For Convention Center",
+"Audience/Seating Area - For Penitentiary",
+"Audience/Seating Area - For Religious Buildings",
+"Audience/Seating Area - For Sports Arena",
+"Audience/Seating Area - For Performing Arts Theater",
+"Audience/Seating Area - For Motion Picture Theater",
+"Audience/Seating Area - For Transportation",
+"Atrium",
+"Atrium - First Three Floors",
+"Atrium - Each Additional Floor",
+"Lounge / Recreation",
+"Lounge / Recreation - For Hospital",
+"Dining Area",
+"Dining Area - For Penitentiary",
+"Dining Area - For Hotel",
+"Dining Area - For Motel",
+"Dining Area - For Bar Lounge/Leisure Dining",
+"Dining Area - For Family Dining",
+"Food Preparation",
+"Laboratory",
+"Restrooms",
+"Dressing / Locker / Fitting",
+"Room",
+"Corridor / Transition",
+"Corridor / Transition - For Hospital",
+"Corridor / Transition - For Manufacturing Facility",
+"Stairs",
+"Active Storage",
+"Active Storage - For Hospital",
+"Inactive Storage",
+"Inactive Storage - For Museum",
+"Electrical / Mechanical",
+"Gymnasium / Exercise Center",
+"Gymnasium / Exercise Center - Playing Area",
+"Gymnasium / Exercise Center - Exercise Area",
+"Courthouse / Police Station / Penitentiary",
+"Courthouse / Police Station / Penitentiary - Courtroom",
+"Courthouse / Police Station / Penitentiary - Confinement Cells",
+"Courthouse / Police Station / Penitentiary - Judges' Chambers",
+"Fire Stations",
+"Fire Stations - Engine Room",
+"Fire Stations - Sleeping Quarters",
+"Post Office - Sorting Area",
+"Convention Center - Exhibit Space",
+"Library",
+"Library - Card File and Cataloging",
+"Library - Stacks",
+"Library - Reading Area",
+"Hospital",
+"Hospital - Emergency",
+"Hospital - Recovery",
+"Hospital - Nurses' Station",
+"Hospital - Exam / Treatment",
+"Hospital - Pharmacy",
+"Hospital - Patient Room",
+"Hospital - Operating Room",
+"Hospital - Nursery",
+"Hospital - Medical Supply",
+"Hospital - Physical Therapy",
+"Hospital - Radiology",
+"Hospital - Laundry-Washing",
+"Automotive - Service / Repair",
+"Manufacturing",
+"Manufacturing - Low Bay (< 7.5m Floor to Ceiling Height)",
+"Manufacturing - High Bay (> 7.5m Floor to Ceiling Height)",
+"Manufacturing - Detailed Manufacturing",
+"Manufacturing - Equipment Room",
+"Manufacturing - Control Room",
+"Hotel / Motel Guest Rooms",
+"Dormitory - Living Quarters",
+"Museum",
+"Museum - General Exhibition",
+"Museum - Restoration",
+"Bank / Office - Banking Activity Area",
+"Workshop",
+"Sales Area",
+"Religious Buildings",
+"Religious Buildings - Worship Pulpit, Choir",
+"Religious Buildings - Fellowship Hall",
+"Retail",
+"Retail - Sales Area",
+"Retail - Mall Concourse",
+"Sports Arena",
+"Sports Arena - Ring Sports Area",
+"Sports Arena - Court Sports Area",
+"Sports Arena - Indoor Playing Field Area",
+"Warehouse",
+"Warehouse - Fine Material Storage",
+"Warehouse - Medium / Bulky Material Storage",
+"Parking Garage - Garage Area",
+"Transportation",
+"Transportation - Airport / Concourse",
+"Transportation - Air / Train / Bus - Baggage Area",
+"Transportation - Terminal - Ticket Counter"
+]
+
 import FreeCAD,ArchComponent,ArchCommands,math,Draft
 if FreeCAD.GuiUp:
     import FreeCADGui
@@ -117,7 +229,9 @@ def __init__(self,obj):
         obj.addProperty("App::PropertyString",     "FinishWalls",  "Arch",translate("Arch","The finishing of the walls of this space"))
         obj.addProperty("App::PropertyString",     "FinishCeiling","Arch",translate("Arch","The finishing of the ceiling of this space"))
         obj.addProperty("App::PropertyLinkList",   "Group",        "Arch",translate("Arch","Objects that are included inside this space, such as furniture"))
+        obj.addProperty("App::PropertyEnum",       "SpaceType",    "Arch",translate("Arch","The type of this space"))
         self.Type = "Space"
+        self.SpaceType = "Undefined"
         obj.Role = Roles
 
     def execute(self,obj):