diff --git a/src/js/setupdns.js b/src/js/setupdns.js
index bde17c614..30017a708 100644
--- a/src/js/setupdns.js
+++ b/src/js/setupdns.js
@@ -50,6 +50,7 @@ app.controller('SetupDNSController', ['$scope', '$http', '$timeout', 'Client', f
         { name: 'Gandi LiveDNS', value: 'gandi' },
         { name: 'GoDaddy', value: 'godaddy' },
         { name: 'Google Cloud DNS', value: 'gcdns' },
+        { name: 'Name.com', value: 'namecom' },
         { name: 'Wildcard', value: 'wildcard' },
         { name: 'Manual (not recommended)', value: 'manual' },
         { name: 'No-op (only for development)', value: 'noop' }
@@ -67,6 +68,8 @@ app.controller('SetupDNSController', ['$scope', '$http', '$timeout', 'Client', f
         cloudflareToken: '',
         godaddyApiKey: '',
         godaddyApiSecret: '',
+        nameComUsername: '',
+        nameComToken: '',
         provider: 'route53'
     };
 
@@ -135,6 +138,9 @@ app.controller('SetupDNSController', ['$scope', '$http', '$timeout', 'Client', f
         } else if (provider === 'cloudflare') {
             data.email = $scope.dnsCredentials.cloudflareEmail;
             data.token = $scope.dnsCredentials.cloudflareToken;
+        } else if (provider === 'namecom') {
+            data.username = $scope.dnsCredentials.nameComUsername;
+            data.token = $scope.dnsCredentials.nameComToken;
         }
 
         Client.setupDnsConfig($scope.dnsCredentials.domain, $scope.explicitZone, provider, data, $scope.tlsConfig, function (error) {
diff --git a/src/setupdns.html b/src/setupdns.html
index 622f552d1..f4aa8b103 100644
--- a/src/setupdns.html
+++ b/src/setupdns.html
@@ -127,6 +127,16 @@
                                     <span ng-show="isDomain || explicitZone"><b>{{ explicitZone ? explicitZone : (dnsCredentials.domain | zoneName) }}</b> must be hosted on <a href="https://www.cloudflare.com" target="_blank">Cloudflare</a>.</span>
                                 </div>
 
+                                <!-- Name.com -->
+                                <div class="form-group" ng-class="{ 'has-error': dnsCredentialsForm.nameComUsername.$dirty && dnsCredentialsForm.nameComUsername.$invalid }" ng-show="dnsCredentials.provider === 'namecom'">
+                                    <input type="text" class="form-control" ng-model="dnsCredentials.nameComUsername" name="nameComUsername" placeholder="Name.com Username" ng-required="dnsCredentials.provider === 'namecom'" ng-disabled="dnsCredentials.busy">
+                                </div>
+                                <div class="form-group" ng-class="{ 'has-error': dnsCredentialsForm.nameComToken.$dirty && dnsCredentialsForm.nameComToken.$invalid }" ng-show="dnsCredentials.provider === 'namecom'">
+                                    <input type="text" class="form-control" ng-model="dnsCredentials.nameComToken" name="nameComToken" placeholder="Name.com API Token" ng-required="dnsCredentials.provider === 'namecom'" ng-disabled="dnsCredentials.busy">
+                                    <br/>
+                                    <span ng-show="isDomain || explicitZone"><b>{{ explicitZone ? explicitZone : (dnsCredentials.domain | zoneName) }}</b> must be hosted on <a href="https://www.name.com/" target="_blank">Name.com</a>.</span>
+                                </div>
+
                                 <!-- Wildcard -->
                                 <p ng-show="dnsCredentials.provider === 'wildcard'">
                                     <span>Setup A records for <b>*.{{ dnsCredentials.domain || 'example.com' }}</b> and <b>{{ dnsCredentials.domain || 'example.com' }}</b> to this server's IP.</span>