diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 ---
-title: SLOANE(1) Sloane User Manual | Version 1.5.1
-date: March 9, 2014
+title: SLOANE(1) Sloane User Manual | Version 1.6
+date: March 18, 2014
 ---
 
 # NAME
diff --git a/changelog.md b/changelog.md
new file mode 100644
--- /dev/null
+++ b/changelog.md
@@ -0,0 +1,4 @@
+sloane 1.6 - March 18, 2014
+===========================
+
+* Properly handle multiple search terms.
diff --git a/sloane.1 b/sloane.1
--- a/sloane.1
+++ b/sloane.1
@@ -1,4 +1,4 @@
-.TH "SLOANE" "1" "March 9, 2014" "Sloane User Manual" "Version 1.5.1"
+.TH "SLOANE" "1" "March 18, 2014" "Sloane User Manual" "Version 1.6"
 .SH NAME
 .PP
 sloane \- a command line interface to Sloane\[aq]s On\-Line Encyclopedia
diff --git a/sloane.cabal b/sloane.cabal
--- a/sloane.cabal
+++ b/sloane.cabal
@@ -1,5 +1,5 @@
 Name:                sloane
-Version:             1.5.1
+Version:             1.6
 Synopsis:            A command line interface to Sloane's On-Line Encyclopedia of Integer Sequences
 Description:         A command line interface to Sloane's On-Line Encyclopedia of Integer Sequences.
                      For usage see <http://github.com/akc/sloane>.
@@ -10,7 +10,7 @@
 Maintainer:          anders.claesson@gmail.com
 Category:            Math
 Build-type:          Custom
-Extra-Source-Files:  README.md sloane.1
+Extra-Source-Files:  README.md sloane.1 changelog.md
 
 Cabal-version:       >=1.6
 
diff --git a/sloane.hs b/sloane.hs
--- a/sloane.hs
+++ b/sloane.hs
@@ -28,7 +28,7 @@
                      , all   :: Bool
                      , url   :: Bool
                      , limit :: Int
-                     , terms :: String
+                     , terms :: [String]
                      }
               deriving (Data, Typeable)
 
@@ -37,9 +37,9 @@
   , all  = False &= name "a"   &= help "Print all fields"
   , url  = False &= name "u"   &= help "Print urls of found entries"
   , limit = 5 &= name "n" &= help "Retrieve at most this many entries (default: 5)"
-  , terms = def &= argPos 0 &= typ "SEARCH-TERMS"
+  , terms = def &= args &= typ "SEARCH-TERMS"
   }
-  &= versionArg [summary "sloane 1.5.1"]
+  &= versionArg [summary "sloane 1.6"]
   &= summary "Search Sloane's On-Line Encyclopedia of Integer Sequences"
 
 select :: Keys -> OEISEntries -> OEISEntries
@@ -90,10 +90,10 @@
             put $ ' ' : crop width (unwords rest) ++ "\n"
 
 main = do
-    args  <- cmdArgsRun sloane
+    args <- cmdArgsRun sloane
     ncols <- getWidth
     let pick = if all args then id else select (keys args)
-    let query = filter (`notElem` "[{}]") $ terms args
+    let query = unwords $ terms args
     hits <- searchOEIS (limit args) query
     unless (null hits) $ do
         newline