diff --git a/src/Expr.cc b/src/Expr.cc
index c34c44a7d1..ee2d90aeed 100644
--- a/src/Expr.cc
+++ b/src/Expr.cc
@@ -2435,7 +2435,7 @@ bool RefExpr::DoUnserialize(UnserialInfo* info)
 	}
 
 AssignExpr::AssignExpr(Expr* arg_op1, Expr* arg_op2, int arg_is_init,
-			Val* arg_val)
+			Val* arg_val, attr_list* arg_attrs)
 : BinaryExpr(EXPR_ASSIGN,
 		arg_is_init ? arg_op1 : arg_op1->MakeLvalue(), arg_op2)
 	{
@@ -2455,14 +2455,14 @@ AssignExpr::AssignExpr(Expr* arg_op1, Expr* arg_op2, int arg_is_init,
 
 	// We discard the status from TypeCheck since it has already
 	// generated error messages.
-	(void) TypeCheck();
+	(void) TypeCheck(arg_attrs);
 
 	val = arg_val ? arg_val->Ref() : 0;
 
 	SetLocationInfo(arg_op1->GetLocationInfo(), arg_op2->GetLocationInfo());
 	}
 
-bool AssignExpr::TypeCheck()
+bool AssignExpr::TypeCheck(attr_list* attrs)
 	{
 	TypeTag bt1 = op1->Type()->Tag();
 	TypeTag bt2 = op2->Type()->Tag();
@@ -2494,6 +2494,19 @@ bool AssignExpr::TypeCheck()
 		return true;
 		}
 
+	if ( bt1 == TYPE_TABLE && op2->Tag() == EXPR_LIST )
+		{
+		attr_list* attr_copy = 0;
+		if ( attrs )
+			{
+			attr_copy = new attr_list;
+			loop_over_list(*attrs, i)
+				attr_copy->append((*attrs)[i]);
+			}
+		op2 = new TableConstructorExpr(op2->AsListExpr(), attr_copy);
+		return true;
+		}
+
 	if ( bt1 == TYPE_VECTOR && bt2 == bt1 &&
 	     op2->Type()->AsVectorType()->IsUnspecifiedVector() )
 		{
diff --git a/src/Expr.h b/src/Expr.h
index 95016a8d13..8676a1ad7e 100644
--- a/src/Expr.h
+++ b/src/Expr.h
@@ -623,7 +623,7 @@ class AssignExpr : public BinaryExpr {
 public:
 	// If val is given, evaluating this expression will always yield the val
 	// yet still perform the assignment.  Used for triggers.
-	AssignExpr(Expr* op1, Expr* op2, int is_init, Val* val = 0);
+	AssignExpr(Expr* op1, Expr* op2, int is_init, Val* val = 0, attr_list* attrs = 0);
 	virtual ~AssignExpr()	{ Unref(val); }
 
 	Expr* Simplify(SimplifyType simp_type);
@@ -638,7 +638,7 @@ protected:
 	friend class Expr;
 	AssignExpr()	{ }
 
-	bool TypeCheck();
+	bool TypeCheck(attr_list* attrs = 0);
 	bool TypeCheckArithmetics(TypeTag bt1, TypeTag bt2);
 
 	DECLARE_SERIAL(AssignExpr);
diff --git a/src/Var.cc b/src/Var.cc
index 897a454670..d54d94a078 100644
--- a/src/Var.cc
+++ b/src/Var.cc
@@ -202,7 +202,8 @@ Stmt* add_local(ID* id, BroType* t, init_class c, Expr* init,
 		Ref(id);
 
 		Stmt* stmt =
-			new ExprStmt(new AssignExpr(new NameExpr(id), init, 0));
+		    new ExprStmt(new AssignExpr(new NameExpr(id), init, 0, 0,
+		        id->Attrs() ? id->Attrs()->Attrs() : 0 ));
 		stmt->SetLocationInfo(init->GetLocationInfo());
 
 		return stmt;
diff --git a/testing/btest/Baseline/language.table-init/output b/testing/btest/Baseline/language.table-init/output
new file mode 100644
index 0000000000..0272e12319
--- /dev/null
+++ b/testing/btest/Baseline/language.table-init/output
@@ -0,0 +1,10 @@
+{
+[2] = two,
+[1] = one
+}
+global table default
+{
+[4] = four,
+[3] = three
+}
+local table default
diff --git a/testing/btest/language/table-init.bro b/testing/btest/language/table-init.bro
new file mode 100644
index 0000000000..5df682c5d2
--- /dev/null
+++ b/testing/btest/language/table-init.bro
@@ -0,0 +1,20 @@
+# @TEST-EXEC: bro %INPUT >output
+# @TEST-EXEC: btest-diff output
+
+global global_table: table[count] of string = {
+    [1] = "one",
+	[2] = "two"
+} &default = "global table default";
+
+event bro_init()
+    {
+    local local_table: table[count] of string = {
+         [3] = "three",
+		 [4] = "four"
+    } &default = "local table default";
+
+    print global_table;
+    print global_table[0];
+    print local_table;
+    print local_table[0];
+    }