diff --git a/src/CommandDialog.cc b/src/CommandDialog.cc
index e7773906..b8cd838e 100644
--- a/src/CommandDialog.cc
+++ b/src/CommandDialog.cc
@@ -35,7 +35,6 @@
 
 using std::string;
 using std::vector;
-using std::auto_ptr;
 using std::less;
 using std::out_of_range;
 
@@ -45,9 +44,9 @@ CommandDialog::CommandDialog(BScreen &screen, const string &title,
     m_precommand(precommand) { }
 
 void CommandDialog::exec(const std::string &text){
-	
+
     // create Command<void> from line
-    auto_ptr<FbTk::Command<void> > cmd(FbTk::CommandParser<void>::instance().parse(m_precommand + text));
+    std::unique_ptr<FbTk::Command<void> > cmd(FbTk::CommandParser<void>::instance().parse(m_precommand + text));
     if (cmd.get())
         cmd->execute();
     // post execute
diff --git a/src/main.cc b/src/main.cc
index 3cc728da..574020a7 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -59,7 +59,6 @@ using std::string;
 using std::ostream;
 using std::ofstream;
 using std::streambuf;
-using std::auto_ptr;
 using std::out_of_range;
 using std::runtime_error;
 using std::bad_cast;
@@ -68,7 +67,7 @@ using std::exception;
 
 namespace {
 
-auto_ptr<Fluxbox> fluxbox;
+std::unique_ptr<Fluxbox> fluxbox;
 
 void handleSignal(int signum) {