diff --git a/app.js b/app.js
index f26691d066..e520d5b383 100644
--- a/app.js
+++ b/app.js
@@ -5,6 +5,7 @@ var express     = require('express'),
     routes      = require('./lib/routes'),
     eventApi    = require('./lib/eventApi'),
     featureApi  = require('./lib/featureApi'),
+    featureArchiveApi  = require('./lib/featureArchiveApi'),
     strategyApi = require('./lib/strategyApi'),
     validator   = require('express-validator'),
     app         = express(),
@@ -39,6 +40,7 @@ app.use(bodyParser.json({strict: false}));
 
 eventApi(router);
 featureApi(router);
+featureArchiveApi(router);
 strategyApi(router);
 routes(router);
 app.use(baseUriPath, router);
diff --git a/lib/eventType.js b/lib/eventType.js
index 029516a712..60d06788f4 100644
--- a/lib/eventType.js
+++ b/lib/eventType.js
@@ -1,6 +1,8 @@
 module.exports = {
     featureCreated : 'feature-created',
     featureUpdated : 'feature-updated',
+    featureArchive : 'feature-archive',
+    featureRevive  : 'feature-revive',
     strategyCreated: 'strategy-created',
     strategyDeleted: 'strategy-deleted'
 };
\ No newline at end of file
diff --git a/lib/featureApi.js b/lib/featureApi.js
index fe9bd715b8..61ff4cfc1d 100644
--- a/lib/featureApi.js
+++ b/lib/featureApi.js
@@ -6,7 +6,7 @@ var featureDb           = require('./featureDb');
 var NameExistsError     = require('./error/NameExistsError');
 var NotFoundError       = require('./error/NotFoundError');
 var ValidationError     = require('./error/ValidationError');
-var validateRequest    = require('./error/validateRequest');
+var validateRequest     = require('./error/validateRequest');
 
 module.exports = function (app) {
 
@@ -41,7 +41,9 @@ module.exports = function (app) {
                 res.status(201).end();
             })
             .catch(NameExistsError, function() {
-                res.status(403).json([{msg: "A feature named '" + req.body.name + "' already exists."}]).end();
+                res.status(403).json([{
+                    msg: "A feature named '" + req.body.name + "' already exists. It could be archived."
+                }]).end();
             })
             .catch(ValidationError, function() {
                 res.status(400).json(req.validationErrors());
@@ -79,6 +81,32 @@ module.exports = function (app) {
             });
     });
 
+    app.delete('/features/:featureName', function (req, res) {
+        var featureName    = req.params.featureName;
+        var userName       = req.connection.remoteAddress;
+
+        featureDb.getFeature(featureName)
+            .then(function () {
+                return eventStore.create({
+                    type: eventType.featureArchive,
+                    createdBy: userName,
+                    data: {
+                        name: featureName
+                    }
+                });
+            })
+            .then(function () {
+                res.status(200).end();
+            })
+            .catch(NotFoundError, function () {
+                res.status(404).end();
+            })
+            .catch(function (err) {
+                logger.error("Could not archive feature="+featureName, err);
+                res.status(500).end();
+            });
+    });
+
     function validateUniqueName(req) {
         return new Promise(function(resolve, reject) {
             featureDb.getFeature(req.body.name)
diff --git a/lib/featureArchiveApi.js b/lib/featureArchiveApi.js
new file mode 100644
index 0000000000..19c12bd09d
--- /dev/null
+++ b/lib/featureArchiveApi.js
@@ -0,0 +1,37 @@
+var logger              = require('./logger');
+var eventStore          = require('./eventStore');
+var eventType           = require('./eventType');
+var featureDb           = require('./featureDb');
+var ValidationError     = require('./error/ValidationError');
+var validateRequest     = require('./error/validateRequest');
+
+module.exports = function (app) {
+
+    app.get('/archive/features', function (req, res) {
+        featureDb.getArchivedFeatures().then(function (archivedFeatures) {
+            res.json({'features': archivedFeatures});
+        });
+    });
+
+    app.post('/archive/revive', function (req, res) {
+        req.checkBody('name', 'Name is required').notEmpty();
+
+        validateRequest(req)
+            .then(function() {
+                return eventStore.create({
+                    type: eventType.featureRevive,
+                    createdBy: req.connection.remoteAddress,
+                    data: req.body
+                });
+            }).then(function() {
+                res.status(200).end();
+            }).catch(ValidationError, function() {
+                res.status(400).json(req.validationErrors());
+            })
+            .catch(function(err) {
+                logger.error("Could not revive feature toggle", err);
+                res.status(500).end();
+            });
+    });
+};
+
diff --git a/lib/featureDb.js b/lib/featureDb.js
index f1f5334b35..9baf329c86 100644
--- a/lib/featureDb.js
+++ b/lib/featureDb.js
@@ -13,10 +13,19 @@ eventStore.on(eventType.featureUpdated, function (event) {
     return updateFeature(event.data);
 });
 
+eventStore.on(eventType.featureArchive, function (event) {
+    return archiveFeature(event.data);
+});
+
+eventStore.on(eventType.featureRevive, function (event) {
+    return reviveFeature(event.data);
+});
+
 function getFeatures() {
     return knex
         .select(FEATURE_COLUMNS)
         .from('features')
+        .where({archived: 0})
         .orderBy('name', 'asc')
         .map(rowToFeature);
 }
@@ -29,6 +38,15 @@ function getFeature(name) {
         .then(rowToFeature);
 }
 
+function getArchivedFeatures() {
+    return knex
+        .select(['name', 'description'])
+        .from('features')
+        .where({archived: 1})
+        .orderBy('name', 'asc');
+}
+
+
 function rowToFeature(row) {
     if (!row) {
         throw new NotFoundError('No feature toggle found');
@@ -48,6 +66,7 @@ function eventDataToRow(data) {
         name: data.name,
         description: data.description,
         enabled: data.enabled ? 1 : 0,
+        archived: data.archived ? 1 :0,
         strategy_name: data.strategy, // jshint ignore: line
         parameters: data.parameters
     };
@@ -70,9 +89,29 @@ function updateFeature(data) {
         });
 }
 
+function archiveFeature(data) {
+    return knex('features')
+        .where({name: data.name})
+        .update({archived: 1})
+        .catch(function (err) {
+            logger.error('Could not archive feature, error was: ', err);
+        });
+}
+
+function reviveFeature(data) {
+    return knex('features')
+        .where({name: data.name})
+        .update({archived: 0, enabled: 0})
+        .catch(function (err) {
+            logger.error('Could not archive feature, error was: ', err);
+        });
+}
+
+
 module.exports = {
     getFeatures: getFeatures,
     getFeature: getFeature,
+    getArchivedFeatures: getArchivedFeatures,
     _createFeature: createFeature, // visible for testing
     _updateFeature: updateFeature  // visible for testing
 };
diff --git a/migrations/20141215210141-005-archived-flag-to-features.js b/migrations/20141215210141-005-archived-flag-to-features.js
new file mode 100644
index 0000000000..12a3995472
--- /dev/null
+++ b/migrations/20141215210141-005-archived-flag-to-features.js
@@ -0,0 +1 @@
+module.exports = require('../lib/migrationRunner').create('005-archived-flag-to-features');
diff --git a/migrations/sql/005-archived-flag-to-features.down.sql b/migrations/sql/005-archived-flag-to-features.down.sql
new file mode 100644
index 0000000000..4330a640ed
--- /dev/null
+++ b/migrations/sql/005-archived-flag-to-features.down.sql
@@ -0,0 +1 @@
+ALTER TABLE features DROP COLUMN "archived";
\ No newline at end of file
diff --git a/migrations/sql/005-archived-flag-to-features.up.sql b/migrations/sql/005-archived-flag-to-features.up.sql
new file mode 100644
index 0000000000..6676bed910
--- /dev/null
+++ b/migrations/sql/005-archived-flag-to-features.up.sql
@@ -0,0 +1 @@
+ALTER TABLE features ADD archived integer DEFAULT 0;
\ No newline at end of file
diff --git a/public/js/__tests__/components/feature/ArchiveFeatureComponent-test.js b/public/js/__tests__/components/feature/ArchiveFeatureComponent-test.js
new file mode 100644
index 0000000000..9391e19fae
--- /dev/null
+++ b/public/js/__tests__/components/feature/ArchiveFeatureComponent-test.js
@@ -0,0 +1,51 @@
+jest.dontMock("../../../components/feature/ArchiveFeatureComponent");
+
+var React = require("react/addons");
+var TestUtils = React.addons.TestUtils;
+var FeatureArchive = require("../../../components/feature/ArchiveFeatureComponent");
+var FeatureStore = require("../../../stores/FeatureStore");
+
+describe("FeatureForm", function () {
+    var Component;
+    beforeEach(function() {
+        FeatureStore.getArchivedFeatures.mockImplementation(function() {
+            return {
+                then: function (callback) {
+                    return callback({
+                        features: [
+                            { name: "featureX" },
+                            { name: "featureY" }
+                        ]
+                    });
+                }
+            };
+        });
+        FeatureStore.reviveFeature.mockImplementation(function() {
+            return {
+                then: function (callback) {return callback();}
+            };
+        });
+
+        Component = TestUtils .renderIntoDocument(<FeatureArchive />);
+    });
+
+    afterEach(function() {
+        React.unmountComponentAtNode(document.body);
+    });
+
+    it("should render two archived features", function() {
+        var rows = Component.getDOMNode().querySelectorAll("tbody tr");
+        expect(rows.length).toEqual(2);
+    });
+
+    it("should revive archived feature toggle", function() {
+        var button = Component.getDOMNode().querySelector("tbody button");
+        TestUtils.Simulate.click(button);
+        var rows = Component.getDOMNode().querySelectorAll("tbody tr");
+
+        expect(rows.length).toEqual(1);
+        expect(FeatureStore.reviveFeature).toBeCalledWith({
+            name: "featureX"
+        });
+    });
+});
\ No newline at end of file
diff --git a/public/js/app.jsx b/public/js/app.jsx
index 72b21835a6..7905d84703 100644
--- a/public/js/app.jsx
+++ b/public/js/app.jsx
@@ -1,10 +1,10 @@
 var React                   = require('react');
 var TabView                 = require('./components/TabView');
 var Menu                    = require('./components/Menu');
-var LogEntriesComponent         = React.createFactory(require('./components/log/LogEntriesComponent'));
+var LogEntriesComponent     = React.createFactory(require('./components/log/LogEntriesComponent'));
 var FeatureTogglesComponent = React.createFactory(require('./components/feature/FeatureTogglesComponent'));
 var StrategiesComponent     = React.createFactory(require('./components/strategy/StrategiesComponent'));
-
+var ArchiveFeatureComponent = React.createFactory(require('./components/feature/ArchiveFeatureComponent'));
 
 var tabPanes = [
     {
@@ -18,6 +18,10 @@ var tabPanes = [
     {
         name: "Log",
         content: new LogEntriesComponent({})
+    },
+    {
+        name: "Archive",
+        content: new ArchiveFeatureComponent({})
     }
 ];
 
diff --git a/public/js/components/feature/ArchiveFeatureComponent.jsx b/public/js/components/feature/ArchiveFeatureComponent.jsx
new file mode 100644
index 0000000000..7bd403eb75
--- /dev/null
+++ b/public/js/components/feature/ArchiveFeatureComponent.jsx
@@ -0,0 +1,64 @@
+var React = require("react");
+var FeatureStore  = require('../../stores/FeatureStore');
+
+var ArchiveFeatureComponent = React.createClass({
+    getInitialState: function() {
+        return {
+            archivedFeatures: []
+        };
+    },
+
+    removeToggleFromState: function(item) {
+        var updatedArchive = this.state.archivedFeatures.filter(function(f) {
+            return f.name !== item.name;
+        });
+        this.setState({archivedFeatures: updatedArchive});
+    },
+
+    onRevive: function( item) {
+        FeatureStore.reviveFeature(item).then(this.removeToggleFromState.bind(this, item));
+    },
+
+    componentDidMount: function () {
+        FeatureStore.getArchivedFeatures().then(function(data) {
+            this.setState({archivedFeatures: data.features});
+        }.bind(this))
+    },
+
+    render: function () {
+        return (
+            <div>
+                <h1>Archived feature toggles</h1>
+                <table className="outerborder man">
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th></th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        {this.state.archivedFeatures.map(this.renderArchivedItem)}
+                    </tbody>
+                </table>
+            </div>
+            );
+    },
+
+    renderArchivedItem: function(f) {
+        return (
+            <tr key={f.name}>
+                <td>
+                    {f.name}<br />
+                    <span className="opaque smalltext word-break">{f.description}</span>
+
+                </td>
+                <td className="rightify" width="150">
+                    <button onClick={this.onRevive.bind(this, f)} title="Revive feature toggle">
+                        <span className="icon-svar"></span>
+                    </button>
+                </td>
+            </tr>);
+    }
+});
+
+module.exports = ArchiveFeatureComponent;
\ No newline at end of file
diff --git a/public/js/components/feature/Feature.jsx b/public/js/components/feature/Feature.jsx
index 47bc20f1e6..30b1913930 100644
--- a/public/js/components/feature/Feature.jsx
+++ b/public/js/components/feature/Feature.jsx
@@ -33,6 +33,12 @@ var Feature = React.createClass({
         this.toggleEditMode();
     },
 
+    archiveFeature: function() {
+        if (confirm("Are you sure you want to delete " + this.props.feature.name + "?")) {
+            this.props.onArchive(this.props.feature);
+        }
+    },
+
 
     renderEditMode: function() {
         return (
@@ -64,14 +70,19 @@ var Feature = React.createClass({
                         {this.props.feature.strategy}
                     </td>
 
-                    <td width="110">
+                    <td width="150">
                         <div className="line">
-                            <div className="unit size1of2">
+                            <div className="unit size1of3">
+                                <button title='Archive' onClick={this.archiveFeature} title="Remove">
+                                    <span className="icon-kryss1" />
+                                </button>
+                            </div>
+                            <div className="unit size1of3">
                                 <button className={this.state.editMode ? "primary" : ""} title='Edit' onClick={this.toggleEditMode}>
                                     <span className="icon-redigere" />
                                 </button>
                             </div>
-                            <div className="unit size1of2">
+                            <div className="unit size1of3">
                                 <button className={this.state.showHistory ? "primary" : ""} title='History' onClick={this.toggleHistory}>
                                     <span className="icon-visning_liste" />
                                 </button>
diff --git a/public/js/components/feature/FeatureList.jsx b/public/js/components/feature/FeatureList.jsx
index f344e71507..6831c38121 100644
--- a/public/js/components/feature/FeatureList.jsx
+++ b/public/js/components/feature/FeatureList.jsx
@@ -8,7 +8,8 @@ var FeatureList = React.createClass({
                 <Feature
                   key={feature.name}
                   feature={feature}
-                  onChange={this.props.onFeatureChanged} />
+                  onChange={this.props.onFeatureChanged}
+                  onArchive={this.props.onFeatureArchive}/>
             );
         }.bind(this));
 
diff --git a/public/js/components/feature/FeatureTogglesComponent.jsx b/public/js/components/feature/FeatureTogglesComponent.jsx
index 4f2d86e612..be50960d3d 100644
--- a/public/js/components/feature/FeatureTogglesComponent.jsx
+++ b/public/js/components/feature/FeatureTogglesComponent.jsx
@@ -11,8 +11,7 @@ var FeatureTogglesComponent = React.createClass({
             features: [],
             errors: [],
             createView: false,
-            featurePoller: new Timer(this.loadFeaturesFromServer, this.props.pollInterval),
-            featureStore: new FeatureStore()
+            featurePoller: new Timer(this.loadFeaturesFromServer, this.props.pollInterval)
         };
     },
 
@@ -26,7 +25,7 @@ var FeatureTogglesComponent = React.createClass({
     },
 
     loadFeaturesFromServer: function () {
-        this.state.featureStore.getFeatures().then(this.setFeatures).catch(this.handleError);
+        FeatureStore.getFeatures().then(this.setFeatures).catch(this.handleError);
     },
 
     setFeatures: function (data) {
@@ -49,12 +48,25 @@ var FeatureTogglesComponent = React.createClass({
     updateFeature: function (feature) {
         this.stopFeaturePoller();
 
-        this.state.featureStore
+        FeatureStore
           .updateFeature(feature)
           .then(this.startFeaturePoller)
           .catch(this.handleError);
     },
 
+    archiveFeature: function (feature) {
+        var updatedFeatures = this.state.features.filter(function(item) {
+            return item.name !== feature.name;
+        });
+
+        FeatureStore
+            .archiveFeature(feature)
+            .then(function() {
+                this.setState({features: updatedFeatures})
+            }.bind(this))
+            .catch(this.handleError);
+    },
+
     startFeaturePoller: function () {
         this.state.featurePoller.start();
     },
@@ -68,7 +80,7 @@ var FeatureTogglesComponent = React.createClass({
     createFeature: function (feature) {
         this.stopFeaturePoller();
 
-        this.state.featureStore
+        FeatureStore
           .createFeature(feature)
           .then(this.cancelNewFeature)
           .then(this.startFeaturePoller)
@@ -121,6 +133,7 @@ var FeatureTogglesComponent = React.createClass({
                 <FeatureList
                   features={this.state.features}
                   onFeatureChanged={this.updateFeature}
+                  onFeatureArchive={this.archiveFeature}
                   onFeatureSubmit={this.createFeature}
                   onFeatureCancel={this.cancelNewFeature}
                   onNewFeature={this.newFeature} />
diff --git a/public/js/stores/FeatureStore.js b/public/js/stores/FeatureStore.js
index b70dbd2932..333ab6bdb6 100644
--- a/public/js/stores/FeatureStore.js
+++ b/public/js/stores/FeatureStore.js
@@ -1,12 +1,9 @@
 var reqwest = require('reqwest');
 
-var FeatureStore = function () {
-};
-
 var TYPE         = 'json';
 var CONTENT_TYPE = 'application/json';
 
-FeatureStore.prototype = {
+FeatureStore = {
     updateFeature: function (feature) {
         return reqwest({
             url: 'features/' + feature.name,
@@ -27,12 +24,38 @@ FeatureStore.prototype = {
         });
     },
 
+    archiveFeature: function (feature) {
+        return reqwest({
+            url: 'features/' + feature.name,
+            method: 'delete',
+            type: TYPE
+        });
+    },
+
     getFeatures: function () {
         return reqwest({
             url: 'features',
             method: 'get',
             type: TYPE
         });
+    },
+
+    getArchivedFeatures: function () {
+        return reqwest({
+            url: 'archive/features',
+            method: 'get',
+            type: TYPE
+        });
+    },
+
+    reviveFeature: function (feature) {
+        return reqwest({
+            url: 'archive/revive',
+            method: 'post',
+            type: TYPE,
+            contentType: CONTENT_TYPE,
+            data: JSON.stringify(feature)
+        });
     }
 };
 
diff --git a/sudo b/sudo
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/test/featureApiSpec.js b/test/featureApiSpec.js
index 0dcb887eba..d93acee57c 100644
--- a/test/featureApiSpec.js
+++ b/test/featureApiSpec.js
@@ -60,4 +60,16 @@ describe('The features api', function () {
             .expect(200, done);
     });
 
+    it('archives a feature by name', function (done) {
+        request
+            .delete('/features/featureX')
+            .expect(200, done);
+    });
+
+    it('can not archive unknown feature', function (done) {
+        request
+            .delete('/features/featureUnknown')
+            .expect(404, done);
+    });
+
 });
\ No newline at end of file
diff --git a/test/featureArchiveApiSpec.js b/test/featureArchiveApiSpec.js
new file mode 100644
index 0000000000..cb4e637d86
--- /dev/null
+++ b/test/featureArchiveApiSpec.js
@@ -0,0 +1,38 @@
+var assert     = require('assert');
+var specHelper = require('./specHelper');
+var request    = specHelper.request;
+var stringify  = function (o) { return JSON.stringify(o, null, ' '); };
+
+describe('The archive features api', function () {
+    beforeEach(function (done) {
+        specHelper.db.resetAndSetup()
+            .then(done.bind(null, null))
+            .catch(done);
+    });
+
+    it('returns three archived toggles', function (done) {
+        request
+            .get('/archive/features')
+            .expect('Content-Type', /json/)
+            .expect(200)
+            .end(function (err, res) {
+                assert(res.body.features.length === 3, "expected 3 features, got " + stringify(res.body));
+                done();
+            });
+    });
+
+    it('revives a feature by name', function (done) {
+        request
+            .post('/archive/revive')
+            .send({name: 'featureArchivedX'})
+            .set('Content-Type', 'application/json')
+            .expect(200, done);
+    });
+
+    it('must set name when reviving toggle', function (done) {
+        request
+            .post('/archive/revive')
+            .expect(400, done);
+    });
+
+});
\ No newline at end of file
diff --git a/test/specHelper.js b/test/specHelper.js
index 8e937bac0b..f91a36a1f1 100644
--- a/test/specHelper.js
+++ b/test/specHelper.js
@@ -51,6 +51,33 @@ function createFeatures() {
             "parameters": {
                 "foo": "rab"
             }
+        },
+        {
+            "name": "featureArchivedX",
+            "description": "the #1 feature",
+            "enabled": true,
+            "archived": true,
+            "strategy": "default"
+        },
+        {
+            "name": "featureArchivedY",
+            "description": "soon to be the #1 feature",
+            "enabled": false,
+            "archived": true,
+            "strategy": "baz",
+            "parameters": {
+                "foo": "bar"
+            }
+        },
+        {
+            "name": "featureArchivedZ",
+            "description": "terrible feature",
+            "enabled": true,
+            "archived": true,
+            "strategy": "baz",
+            "parameters": {
+                "foo": "rab"
+            }
         }
     ], function (feature) { return featureDb._createFeature(feature);  });
 }