diff --git a/ChangeLog b/ChangeLog
index a4e5633e09acdc27e1124987ea14d837362cb3eb..781d9bd2fad16135834188688f4ceac03d1206fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,13 @@
+2014-04-26  Niels Möller  <nisse@lysator.liu.se>
+
+	* umac.h (UMAC_MIN_NONCE_SIZE, UMAC_MAX_NONCE_SIZE): New
+	constants.
+
 2014-04-25  Niels Möller  <nisse@lysator.liu.se>
 
 	* All hash-related files: Renamed all _DATA_SIZE constants to
 	_BLOCK_SIZE, for consistency. Old names kept for backwards
-	compatibility. 
+	compatibility.
 
 	* nettle.texinfo (CCM): Documentation for CCM mode, contributed by
 	Owen Kirby.
diff --git a/umac.h b/umac.h
index 1136fcdc167ab6f38b1cb98a4bee9a17ed392820..f4d3c7ad1363df08d1cce10a43ec2e7e5afeddc6 100644
--- a/umac.h
+++ b/umac.h
@@ -75,6 +75,8 @@ extern "C" {
 #define UMAC96_DIGEST_SIZE 12
 #define UMAC128_DIGEST_SIZE 16
 #define UMAC_BLOCK_SIZE 1024
+#define UMAC_MIN_NONCE_SIZE 1
+#define UMAC_MAX_NONCE_SIZE AES_BLOCK_SIZE
 /* For backwards compatibility */
 #define UMAC_DATA_SIZE UMAC_BLOCK_SIZE