diff --git a/changelog b/changelog
--- a/changelog
+++ b/changelog
@@ -1,3 +1,13 @@
+pandoc (1.8.2.1)
+
+  * Relaxed cabal consntraints for test-framework (S. Trofimovich).
+
+  * Relaxed cabal constraints for pandoc-types.
+
+  * Adjusted Arbitrary instance to help avoid timeouts in tests.
+
+  * Added `Tests.Writers.Markdown` to cabal file.
+
 pandoc (1.8.2)
 
   * Added script to produce OS X package.
diff --git a/pandoc.cabal b/pandoc.cabal
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -1,5 +1,5 @@
 Name:            pandoc
-Version:         1.8.2
+Version:         1.8.2.1
 Cabal-Version:   >= 1.6
 Build-Type:      Custom
 License:         GPL
@@ -207,7 +207,7 @@
                  random >= 1 && < 1.1,
                  extensible-exceptions >= 0.1 && < 0.2,
                  citeproc-hs >= 0.3.1 && < 0.4,
-                 pandoc-types == 1.8.0.2,
+                 pandoc-types == 1.8.*,
                  json >= 0.4 && < 0.5,
                  dlist >= 0.4 && < 0.6,
                  tagsoup >= 0.12 && < 0.13,
@@ -293,7 +293,7 @@
                  random >= 1 && < 1.1,
                  extensible-exceptions >= 0.1 && < 0.2,
                  citeproc-hs >= 0.3.1 && < 0.4,
-                 pandoc-types == 1.8.0.2,
+                 pandoc-types == 1.8.*,
                  json >= 0.4 && < 0.5,
                  dlist >= 0.4 && < 0.6,
                  tagsoup >= 0.12 && < 0.13,
@@ -351,7 +351,7 @@
     else
       Ghc-Options:    -Wall
     Extensions:       CPP
-    Build-Depends:    base >= 4 && < 5, Diff, test-framework >= 0.3 && < 0.4,
+    Build-Depends:    base >= 4 && < 5, Diff, test-framework >= 0.3 && < 0.5,
                       test-framework-hunit >= 0.2 && < 0.3,
                       test-framework-quickcheck2 >= 0.2.9 && < 0.3,
                       QuickCheck >= 2.4 && < 2.6,
diff --git a/src/Tests/Arbitrary.hs b/src/Tests/Arbitrary.hs
--- a/src/Tests/Arbitrary.hs
+++ b/src/Tests/Arbitrary.hs
@@ -28,7 +28,7 @@
   arbitrary = liftM fromList arbitrary
 
 instance Arbitrary Inline where
-  arbitrary = resize 3 $ arbInline 3
+  arbitrary = resize 3 $ arbInline 2
 
 arbInlines :: Int -> Gen [Inline]
 arbInlines n = listOf1 (arbInline n) `suchThat` (not . startsWithSpace)
@@ -72,7 +72,7 @@
                    ]
 
 instance Arbitrary Block where
-  arbitrary = resize 3 $ arbBlock 3
+  arbitrary = resize 3 $ arbBlock 2
 
 arbBlock :: Int -> Gen Block
 arbBlock n = frequency $ [ (10, liftM Plain $ arbInlines (n-1))