diff --git a/README.txt b/README.txt
index e23ba1964..77d35bd27 100644
--- a/README.txt
+++ b/README.txt
@@ -2,7 +2,7 @@
 			   September 18, 1999		
 
 
-1.0 What is ICARUS Verilog(IVL)?
+1.0 What is ICARUS Verilog?
 
 Icarus Verilog is intended to compile ALL of the Verilog HDL as described
 in the IEEE-1364 standard. Of course, it's not quite there yet. It does
@@ -266,11 +266,19 @@ current state of support for Verilog.
 
   - fork/join is not supported in vvm runtime
 
-  - structural arithmetic operators are in general not
-    supported. Procedural expressions are OK.
+  - structural arithmetic operators are in general not supported.
+    Procedural expressions are OK. Constant expressions are OK.
 
             assign foo = a + b; // sorry
             always @(a or b) foo = a + b; // OK
+	    parameter foo = a + b; // OK
+
+  - Structural shift operators are in general not supported.
+    Procedural expressions are OK. Constant expressions are OK.
+
+            assign foo = a << b; // sorry
+	    always @(a or b) foo = a << b; // OK
+	    parameter foo = a << b; // OK
 
   - Functions in structural contexts are not supported.
 
diff --git a/elaborate.cc b/elaborate.cc
index 04a0fb397..83fe1c0ae 100644
--- a/elaborate.cc
+++ b/elaborate.cc
@@ -17,7 +17,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #if !defined(WINNT)
-#ident "$Id: elaborate.cc,v 1.113 1999/10/08 17:48:08 steve Exp $"
+#ident "$Id: elaborate.cc,v 1.114 1999/10/09 19:24:04 steve Exp $"
 #endif
 
 /*
@@ -797,8 +797,17 @@ NetNet* PEBinary::elaborate_net(Design*des, const string&path,
 		break;
 	  }
 
+	  case 'l':
+	  case 'r':
+	    cerr << get_line() << ": sorry: combinational shift"
+		  " not supported here." << endl;
+	    des->errors += 1;
+	    osig = 0;
+	    break;
 	  default:
-	    cerr << "internal eror: Unhandled BINARY '" << op_ << "'" << endl;
+	    cerr << get_line() << ": internal error: unsupported"
+		  " combinational operator (" << op_ << ")." << endl;
+	    des->errors += 1;
 	    osig = 0;
       }
 
@@ -2587,6 +2596,9 @@ Design* elaborate(const map<string,Module*>&modules,
 
 /*
  * $Log: elaborate.cc,v $
+ * Revision 1.114  1999/10/09 19:24:04  steve
+ *  Better message for combinational operators.
+ *
  * Revision 1.113  1999/10/08 17:48:08  steve
  *  Support + in constant expressions.
  *