diff --git a/CHANGELOG.md b/CHANGELOG.md
index ba787f16f..c6908ac0c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,8 +13,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased] ##
+### Fixed ###
 - Suppress repeated xattr warnings on destination filesystems that do not
-  support xattrs.
+  support xattrs. opencontainers/umoci#311
+- Work around a long-standing issue in our command-line parsing library (see
+  urfave/cli#1152) by disabling argument re-ordering for `umoci config`, which
+  often takes `-`-prefixed flag arguments. opencontainers/umoci#328
 
 ## [0.4.5] - 2019-12-04 ##
 ### Added ###
diff --git a/cmd/umoci/config.go b/cmd/umoci/config.go
index 71165eddb..e2f548976 100644
--- a/cmd/umoci/config.go
+++ b/cmd/umoci/config.go
@@ -59,6 +59,18 @@ image.`,
 		return nil
 	},
 
+	// Do not re-order arguments.
+	//
+	// It turns out that urfave/cli incorrectly handles cases like
+	// [--config.cmd -c] during argument re-ordering for subcommands, causing
+	// us a fair number of issues when users are trying to pass a flag an
+	// argument that starts with a dash. Luckily 'umoci config' doesn't take
+	// positional arguments, so disabling argument re-ordering has no other
+	// real effect.
+	//
+	// See <https://github.com/urfave/cli/issues/1152> for more details.
+	SkipArgReorder: true,
+
 	Flags: []cli.Flag{
 		cli.StringFlag{Name: "config.user"},
 		cli.StringSliceFlag{Name: "config.exposedports"},