diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index e9a7330db63e..cf91451775c1 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2011-11-14  Ed Smith-Rowland  <3dw4rd@verizon.net>
+
+	PR c++/51107
+	* typeck.c (check_literal_operator_args): Add processing_specialization
+	to check for void template fn. Test for exact arity for non-template fn.
+
 2011-11-14  Fabien Chêne  <fabien@gcc.gnu.org>
 
 	PR c++/6936
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index f08877c5b612..b8d4c10c8ca2 100644
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -8423,9 +8423,8 @@ check_literal_operator_args (const_tree decl,
 			     bool *long_long_unsigned_p, bool *long_double_p)
 {
   tree argtypes = TYPE_ARG_TYPES (TREE_TYPE (decl));
-  if (processing_template_decl)
-    return (argtypes == NULL_TREE
-	    || same_type_p (TREE_VALUE (argtypes), void_type_node));
+  if (processing_template_decl || processing_specialization)
+    return argtypes == void_list_node;
   else
     {
       tree argtype;
@@ -8494,7 +8493,7 @@ check_literal_operator_args (const_tree decl,
       if (!argtype)
 	return false; /* Found ellipsis.  */
 
-      if (arity > max_arity)
+      if (arity != max_arity)
 	return false;
 
       return true;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e371383f0cc4..b30ee641923a 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2011-11-14  Ed Smith-Rowland  <3dw4rd@verizon.net>
+
+	PR c++/51107
+	* g++.dg/cpp0x/udlit-args-neg.C: Add check for void argument non-
+	template literal operator.
+
 2011-11-14  Uros Bizjak  <ubizjak@gmail.com>
 
 	* gcc.target/i386/sse4_1-floor-sfix-vec.c: New test.
diff --git a/gcc/testsuite/g++.dg/cpp0x/udlit-args-neg.C b/gcc/testsuite/g++.dg/cpp0x/udlit-args-neg.C
index cb924a249bf6..df7b7281c3d9 100644
--- a/gcc/testsuite/g++.dg/cpp0x/udlit-args-neg.C
+++ b/gcc/testsuite/g++.dg/cpp0x/udlit-args-neg.C
@@ -4,6 +4,9 @@
 
 class Foo { };
 
+int
+operator"" _Foo();	// { dg-error "has invalid argument list" }
+
 Foo
 operator"" _Foo(int *);	// { dg-error "has invalid argument list" }