diff --git a/HPasteIt.hs b/HPasteIt.hs
--- a/HPasteIt.hs
+++ b/HPasteIt.hs
@@ -89,7 +89,7 @@
 
         -- hpaste.org redirects us to the URL of the paste if pasting succeeds.
         -- In order to grab the URL we explicitly don't follow redirects.
-        httpLbs (rq' { redirectCount = 0 }) man
+        httpLbs (rq' { redirectCount = 0, responseTimeout = Just 60 }) man
 
     case res of
         -- An exception is thrown if the server issues a redirect.
@@ -117,7 +117,7 @@
     res <- withManager $ \man -> try $ do
         rq <- parseUrl ("http://hpaste.org/raw/" ++ show opt_paste_id)
 
-        httpLbs (rq { redirectCount = 0}) man
+        httpLbs (rq { redirectCount = 0, responseTimeout = Just 60 }) man
 
     case res of
         Left (StatusCodeException (Status 302 _) hdrs)
diff --git a/ProgOpts.hs b/ProgOpts.hs
--- a/ProgOpts.hs
+++ b/ProgOpts.hs
@@ -102,8 +102,7 @@
                                 , help    "The IRC channel to notify"
                                 ])
 
-        <*> switch (mconcat [ metavar "DEBUG"
-                            , value False
+        <*> switch (mconcat [ value False
                             , long "debug"
                             , short 'd'
                             , showDefault
diff --git a/hpasteit.cabal b/hpasteit.cabal
--- a/hpasteit.cabal
+++ b/hpasteit.cabal
@@ -1,5 +1,5 @@
 name:                hpasteit
-version:             0.3.0.0
+version:             0.3.1
 synopsis:            A command-line client for hpaste.org
 license:             BSD3
 license-file:        LICENSE
@@ -18,6 +18,14 @@
   .
   Run @hpasteit --help@ for usage information and @hpasteit COMMAND --help@ for
   detailed usage information about a particular command.
+
+  .
+
+  Changes in 0.3.1
+  .
+  * HTTP connections now time out after 60 seconds instead of 5 seconds
+  .
+  * shortened version number to three sequences
 
   .