diff --git a/openbsc/src/gprs/sgsn_libgtp.c b/openbsc/src/gprs/sgsn_libgtp.c
index 07dbc26..008ec1e 100644
--- a/openbsc/src/gprs/sgsn_libgtp.c
+++ b/openbsc/src/gprs/sgsn_libgtp.c
@@ -227,11 +227,16 @@
 	pdp->rattype.v[0] = 2;
 	pdp->rattype_given = 1;
 
-	/* include the routing area identity all the time */
+	/* Include RAI and ULI all the time */
 	pdp->rai_given = 1;
 	pdp->rai.l = 6;
 	gsm48_construct_ra(pdp->rai.v, &mmctx->ra);
 
+	pdp->userloc_given = 1;
+	pdp->userloc.l = 8;
+	pdp->userloc.v[0] = 0; /* CGI for GERAN */
+	bssgp_create_cell_id(&pdp->userloc.v[1], &mmctx->ra, mmctx->cell_id);
+
 	/* change pdp state to 'requested' */
 	pctx->state = PDP_STATE_CR_REQ;