diff --git a/.gitignore b/.gitignore
index 3c6d099f..42b64dde 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,5 @@ node_modules
 *.sublime-workspace
 npm-debug.log
 sauce_connect.log*
+.idea
+yarn-error.log
diff --git a/lib/handlebars/compiler/javascript-compiler.js b/lib/handlebars/compiler/javascript-compiler.js
index 471144dd..ff98ad9e 100644
--- a/lib/handlebars/compiler/javascript-compiler.js
+++ b/lib/handlebars/compiler/javascript-compiler.js
@@ -13,6 +13,9 @@ JavaScriptCompiler.prototype = {
   // PUBLIC API: You can override these methods in a subclass to provide
   // alternative compiled forms for name lookup and buffering semantics
   nameLookup: function(parent, name/* , type*/) {
+    if (name === 'constructor') {
+      return ['(', parent, '.propertyIsEnumerable(\'constructor\') ? ', parent, '.constructor : undefined', ')'];
+    }
     if (JavaScriptCompiler.isValidJavaScriptVariableName(name)) {
       return [parent, '.', name];
     } else {
diff --git a/spec/security.js b/spec/security.js
new file mode 100644
index 00000000..fbf1beda
--- /dev/null
+++ b/spec/security.js
@@ -0,0 +1,22 @@
+describe('security issues', function() {
+
+    it('should not allow constructors to be accessed', function() {
+        shouldCompileTo('{{#with this as |obj|}}{{obj.constructor.name}}{{/with}}', {}, '');
+    });
+
+    it('should allow the "constructor" property to be accessed if it is enumerable', function() {
+        shouldCompileTo('{{constructor.name}}', {'constructor': {
+            'name': 'here we go'
+        }}, 'here we go');
+    });
+
+    it('should allow prototype properties that are not constructors', function() {
+        class TestClass {
+            get abc() {
+                return 'xyz';
+            }
+        }
+        shouldCompileTo('{{#with this as |obj|}}{{obj.abc}}{{/with}}',
+            new TestClass(), 'xyz');
+    });
+});