diff --git a/103280/TS_103_280.asn1 b/103280/TS_103_280.asn1
index 0ba972553bfc385fc42dc82076ac7dfe767731f6..e9c6e55812cd82743656e5012cc9fe9cb1cfbd5c 100644
--- a/103280/TS_103_280.asn1
+++ b/103280/TS_103_280.asn1
@@ -97,4 +97,6 @@ VLANID ::= INTEGER (0..4095)
 
 ServiceAccessIdentifier ::= UTF8String
 
+MACAddress ::= OCTET STRING (SIZE(6))
+
 END
diff --git a/103280/TS_103_280_Location.asn1 b/103280/TS_103_280_Location.asn1
new file mode 100644
index 0000000000000000000000000000000000000000..19589ce6b31fe6cb3adc62eb0fb10a75f470a385
--- /dev/null
+++ b/103280/TS_103_280_Location.asn1
@@ -0,0 +1,162 @@
+CommonLocations
+{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) commonLocations(39) genHeader(1) version1(1)}
+
+DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::=
+
+BEGIN
+
+IMPORTS
+-- from ETSI TS 103 280 Common-Parameters
+    WGS84CoordinateDecimal,
+    WGS84LatitudeDecimal,
+    WGS84LongitudeDecimal,
+    MACAddress
+        FROM Common-Parameters
+        {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version261(261)}
+
+
+    -- previously from ETSI TS 101 671; now provided with this specification ETSI TS 102 232-1 [1]
+    Location
+        FROM HI2Operations
+        {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version17(18)}
+
+    -- from 3GPP TS 33.108 [AA]
+    Location
+        FROM UmtsHI2Operations
+        {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2(1)}
+            -- The relevant module (including the 3GPP release and version number) needs
+            -- to be chosen when compiling the application.
+
+    -- from 3GPP TS 33.108 [AA]
+    EPSLocation
+        FROM EpsHI2Operations
+        {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2eps(8)}
+            -- The relevant module (including the 3GPP release and version number) needs
+            -- to be chosen when compiling the application.
+
+    -- from 3GPP TS 33.128 [46]
+    Location
+        FROM TS33128Payloads
+        {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19)};
+        -- The relevant module (including the 3GPP release and version number)
+        -- needs to be chosen when compiling the application.
+
+-- end of IMPORTS
+
+-- =============================
+-- Object Identifier Definitions
+-- =============================
+
+lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)}
+
+CommonLocations OBJECT IDENTIFIER ::= {lawfulInterceptDomainId commonLocations(39) genHeader(1) version1(1)}
+
+-- ====================
+-- Top-level definition
+-- ====================
+
+Locations ::= SEQUENCE (SIZE (1..MAX)) OF Location
+
+Location ::= SEQUENCE
+{
+    locatoinInformation [1] LocationInformation,
+    locationProvenance  [2] LocationProvenance,
+    ...
+}
+
+LocationInformation ::= CHOICE
+{
+    umtsHI2Location               [1] UmtsHI2Operations.Location,
+    epsLocation                   [2] EpsHI2Operations.EPSLocation,
+    wlanLocationAttributes        [3] WlanLocationAttributes,
+    eTSI671HI2Location            [4] HI2Operations.Location,
+    threeGPP33128UserLocation     [5] TS33128Payloads.UserLocation,
+    wGS84CoordinateDecimal        [6] Common-Parameters.WGS84CoordinateDecimal,
+    wGS84LatitudeDecimal          [7] Common-Parameters.WGS84LatitudeDecimal,
+    WGS84LongitudeDecimal         [8] Common-Parameters.WGS84LongitudeDecimal,
+    pIDF-LO                       [9] XMLType
+    ...
+}
+
+LocationProvenance ::= SEQUENCE
+{
+    locationNetworkProvenance [1] LocationNetworkProvenance,
+    locationLIProvenance      [2] LocationLIProvenance,
+    ...
+}
+
+LocationNetworkProvenance ::= SEQUENCE
+{
+    locationSource        [1] LocationSource,
+    locationTimeStamps    [2] SEQUENCE (SIZE (1..MAX)) OF LocationTimestamp,
+    additionalInformation [3] UTF8String OPTIONAL,
+    ...
+}
+
+LocationLIProvenance ::= SEQUENCE
+{
+    lIProvenance          [1] LIProvenance,
+    sourceNF              [2] SourceNF,
+    locationTimeStamps    [3] SEQUENCE (SIZE (1..MAX)) OF LocationTimestamp,
+    additionalInformation [4] UTF8String OPTIONAL,
+    ...
+}
+
+LocationSource ::= ENUMERATED
+{
+    other(1),
+    unknown(2),
+    cPEOrClient(3),
+    network(4),
+    ...
+}
+
+LocationTimestamp ::= SEQUENCE
+{
+    timeStamp [1] GeneralizedTime,
+    locationTimeStampQualifier [2] LocationTimeStampQualifier,
+    ...
+}
+
+LIProvenance ::= ENUMERATED
+{
+    other(1),
+    observed(2),
+    nFContext(3),
+    nFLookup(4),
+    ...
+}
+
+SourceNF ::= ENUMERATED
+{
+    aDMF(1),
+    tF(2),
+    pOI(3),
+    mDF(4),
+    ...
+}
+
+LocationTimeStampQualifier ::= ENUMERATED
+{
+    unknown(1),
+    timeOfInterception(2),
+    timeOfMediation(3),
+    timeOfCalculation(4),
+    timeLastObserved(5),
+    ...
+}
+
+WlanLocationAttributes ::= SEQUENCE
+{
+    wlanAPMACAddress [1] Common-Parameters.MACAddress OPTIONAL,
+    ...
+}
+
+XMLType ::= SEQUENCE
+{
+    xMLNamespace [1] XMLNamespace,
+    xMLValue     [2] XMLValue,
+    ...
+}
+
+END