﻿<?xml version="1.0" encoding="utf-8"?>
<InstanceReport xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
  <Version>2.2.0.7</Version>
  <hasSegments>false</hasSegments>
  <ReportName>Goodwill and Other Intangible Assets</ReportName>
  <ReportLongName>11601 - Disclosure - Goodwill and Other Intangible Assets</ReportLongName>
  <DisplayLabelColumn>true</DisplayLabelColumn>
  <ShowElementNames>false</ShowElementNames>
  <RoundingOption />
  <HasEmbeddedReports>false</HasEmbeddedReports>
  <Columns>
    <Column>
      <LabelColumn>false</LabelColumn>
      <Id>1</Id>
      <Labels>
        <Label Id="1" Label="9 Months Ended" />
        <Label Id="2" Label="Sep. 30, 2010" />
      </Labels>
      <CurrencyCode>USD</CurrencyCode>
      <FootnoteIndexer />
      <hasSegments>false</hasSegments>
      <hasScenarios>false</hasScenarios>
      <Segments />
      <Scenarios />
      <Units>
        <Unit>
          <UnitID>Unit12</UnitID>
          <UnitType>Standard</UnitType>
          <StandardMeasure>
            <MeasureSchema>http://www.xbrl.org/2003/iso4217</MeasureSchema>
            <MeasureValue>USD</MeasureValue>
            <MeasureNamespace>iso4217</MeasureNamespace>
          </StandardMeasure>
          <Scale>0</Scale>
        </Unit>
        <Unit>
          <UnitID>Unit13</UnitID>
          <UnitType>Divide</UnitType>
          <NumeratorMeasure>
            <MeasureSchema>http://www.xbrl.org/2003/iso4217</MeasureSchema>
            <MeasureValue>USD</MeasureValue>
            <MeasureNamespace>iso4217</MeasureNamespace>
          </NumeratorMeasure>
          <DenominatorMeasure>
            <MeasureSchema>http://www.xbrl.org/2003/instance</MeasureSchema>
            <MeasureValue>shares</MeasureValue>
            <MeasureNamespace>xbrli</MeasureNamespace>
          </DenominatorMeasure>
          <Scale>0</Scale>
        </Unit>
        <Unit>
          <UnitID>Unit1</UnitID>
          <UnitType>Standard</UnitType>
          <StandardMeasure>
            <MeasureSchema>http://www.xbrl.org/2003/instance</MeasureSchema>
            <MeasureValue>shares</MeasureValue>
            <MeasureNamespace>xbrli</MeasureNamespace>
          </StandardMeasure>
          <Scale>0</Scale>
        </Unit>
      </Units>
      <CurrencySymbol>$</CurrencySymbol>
    </Column>
  </Columns>
  <Rows>
    <Row>
      <Id>2</Id>
      <Label>Goodwill and Other Intangible Assets</Label>
      <Level>0</Level>
      <ElementName>pnm_GoodwillAndOtherIntangibleAssetsAbstract</ElementName>
      <ElementPrefix>pnm</ElementPrefix>
      <IsBaseElement>false</IsBaseElement>
      <BalanceType>na</BalanceType>
      <PeriodType>duration</PeriodType>
      <ShortDefinition>Goodwill and Other Intangible Assets [Abstract]</ShortDefinition>
      <IsReportTitle>false</IsReportTitle>
      <IsSegmentTitle>false</IsSegmentTitle>
      <IsSubReportEnd>false</IsSubReportEnd>
      <IsCalendarTitle>false</IsCalendarTitle>
      <IsTuple>false</IsTuple>
      <IsAbstractGroupTitle>true</IsAbstractGroupTitle>
      <IsEquityPrevioslyReportedAsRow>false</IsEquityPrevioslyReportedAsRow>
      <IsEquityAdjustmentRow>false</IsEquityAdjustmentRow>
      <IsBeginningBalance>false</IsBeginningBalance>
      <IsEndingBalance>false</IsEndingBalance>
      <IsReverseSign>false</IsReverseSign>
      <PreferredLabelRole />
      <IsEPS>false</IsEPS>
      <FootnoteIndexer />
      <Cells>
        <Cell>
          <Id>1</Id>
          <ShowCurrencySymbol>false</ShowCurrencySymbol>
          <IsNumeric>false</IsNumeric>
          <IsRatio>false</IsRatio>
          <DisplayZeroAsNone>false</DisplayZeroAsNone>
          <NumericAmount>0</NumericAmount>
          <RoundedNumericAmount>0</RoundedNumericAmount>
          <NonNumbericText />
          <NonNumericTextHeader />
          <FootnoteIndexer />
          <hasSegments>false</hasSegments>
          <hasScenarios>false</hasScenarios>
          <DisplayDateInUSFormat>false</DisplayDateInUSFormat>
        </Cell>
      </Cells>
      <OriginalInstanceReportColumns />
      <ElementDataType>xbrli:stringItemType</ElementDataType>
      <SimpleDataType>string</SimpleDataType>
      <ElementDefenition>Goodwill and Other Intangible Assets [Abstract]</ElementDefenition>
      <IsTotalLabel>false</IsTotalLabel>
    </Row>
    <Row>
      <Id>3</Id>
      <Label>Goodwill and Other Intangible Assets</Label>
      <Level>1</Level>
      <ElementName>pnm_GoodwillAndOtherIntangibleAssetsTextBlock</ElementName>
      <ElementPrefix>pnm</ElementPrefix>
      <IsBaseElement>false</IsBaseElement>
      <BalanceType>na</BalanceType>
      <PeriodType>duration</PeriodType>
      <ShortDefinition>Describes an entity's accounting policy for goodwill and intangible assets. This accounting policy also may address how an...</ShortDefinition>
      <IsReportTitle>false</IsReportTitle>
      <IsSegmentTitle>false</IsSegmentTitle>
      <IsSubReportEnd>false</IsSubReportEnd>
      <IsCalendarTitle>false</IsCalendarTitle>
      <IsTuple>false</IsTuple>
      <IsAbstractGroupTitle>false</IsAbstractGroupTitle>
      <IsEquityPrevioslyReportedAsRow>false</IsEquityPrevioslyReportedAsRow>
      <IsEquityAdjustmentRow>false</IsEquityAdjustmentRow>
      <IsBeginningBalance>false</IsBeginningBalance>
      <IsEndingBalance>false</IsEndingBalance>
      <IsReverseSign>false</IsReverseSign>
      <PreferredLabelRole>terselabel</PreferredLabelRole>
      <IsEPS>false</IsEPS>
      <FootnoteIndexer />
      <Cells>
        <Cell>
          <Id>1</Id>
          <ShowCurrencySymbol>false</ShowCurrencySymbol>
          <IsNumeric>false</IsNumeric>
          <IsRatio>false</IsRatio>
          <DisplayZeroAsNone>false</DisplayZeroAsNone>
          <NumericAmount>0</NumericAmount>
          <RoundedNumericAmount>0</RoundedNumericAmount>
          <NonNumbericText>&lt;div&gt; &lt;font style="font-family: Times New Roman;" class="_mt" size="2"&gt;
&lt;/font&gt;
&lt;div&gt;
&lt;table style="border-collapse: collapse;" border="0" cellspacing="0" cellpadding="0" width="100%"&gt;
&lt;tr&gt;&lt;td valign="top" width="4%" align="left"&gt;&lt;font style="font-family: Times New Roman;" class="_mt" size="2"&gt;&lt;b&gt;(16)&lt;/b&gt;&lt;/font&gt;&lt;/td&gt;
&lt;td valign="top" align="left"&gt;
&lt;p align="justify"&gt;&lt;font style="font-family: Times New Roman;" class="_mt" size="2"&gt;&lt;b&gt;Goodwill and Other Intangible Assets &lt;/b&gt;&lt;/font&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;
&lt;p style="margin-top: 6px; text-indent: 7%; margin-bottom: 0px;" align="justify"&gt;&lt;font style="font-family: Times New Roman;" class="_mt" size="2"&gt;The excess purchase price over the fair value of the assets acquired and the liabilities assumed by PNMR for its June&amp;nbsp;6, 2005 acquisition of TNP was recorded as goodwill and was pushed down to the businesses acquired. In 2007, the TNMP assets that were included in its New Mexico operations, including goodwill, were transferred to PNM. Additionally, other intangible assets, the trade name "First Choice" and the First Choice customer list, were acquired in the TNP acquisition. The trade name is considered to have an indefinite useful life; therefore, no amortization is recorded. The useful life of the customer list was estimated to be approximately eight years. &lt;/font&gt;&lt;/p&gt;
&lt;p style="margin-top: 12px; text-indent: 7%; margin-bottom: 0px;" align="justify"&gt;&lt;font style="font-family: Times New Roman;" class="_mt" size="2"&gt;The Company evaluates its goodwill and non-amortizing intangible assets for impairment annually at the reporting unit level or more frequently if circumstances indicate that the goodwill or intangible assets may be impaired. Application of the impairment test requires judgment, including the identification of reporting units, assignment of assets and liabilities to reporting units, and determination of the fair value of each reporting unit. The fair value of each reporting unit is estimated using a discounted cash flow methodology. This analysis requires significant judgments, including estimation of future cash flows, which is dependent on internal forecasts, estimation of long-term growth rates for the business, and determination of appropriate weighted average cost of capital for each reporting unit. Changes in these estimates and assumptions could materially affect the determination of fair value and the conclusion of impairment for each reporting unit. &lt;/font&gt;&lt;/p&gt;
&lt;p style="margin-top: 12px; text-indent: 7%; margin-bottom: 0px;" align="justify"&gt;&lt;font style="font-family: Times New Roman;" class="_mt" size="2"&gt;For non-amortizing intangibles other than goodwill, the Company compares the fair value of the intangible asset to its recorded value. For goodwill, the first step of the impairment test requires that the Company compare the fair value of each reporting unit with its carrying value, including goodwill. If as a result of this analysis, the Company concludes there is an indication of impairment in a reporting unit having goodwill, the Company is required to perform the second step of the impairment analysis, determining the amount of goodwill impairment to be recorded. The amount is calculated by comparing the implied fair value of the goodwill to its carrying amount. This exercise would require the Company to allocate the fair value determined in step one to the individual assets and liabilities of the reporting unit. Any remaining fair value would be the implied fair value of goodwill on the testing date. To the extent the recorded amount of goodwill of a reporting unit exceeds the implied fair value determined in step two, an impairment loss would be reflected in results of operations. &lt;/font&gt;&lt;/p&gt;
&lt;p style="margin-top: 12px; text-indent: 7%; margin-bottom: 0px;" align="justify"&gt;&lt;font style="font-family: Times New Roman;" class="_mt" size="2"&gt;The annual evaluations performed as of April&amp;nbsp;1, 2010 and 2009 did not indicate impairments of any of PNMR's reporting units or other intangible assets. Since the annual evaluation, there have been no indications that the fair values of the reporting units with recorded goodwill have decreased below the carrying values. &lt;/font&gt;&lt;/p&gt;&lt;/div&gt; &lt;/div&gt;</NonNumbericText>
          <NonNumericTextHeader>(16)

Goodwill and Other Intangible Assets
The excess purchase price over the fair value of the assets acquired and the liabilities assumed by PNMR for its</NonNumericTextHeader>
          <FootnoteIndexer />
          <hasSegments>false</hasSegments>
          <hasScenarios>false</hasScenarios>
          <DisplayDateInUSFormat>false</DisplayDateInUSFormat>
        </Cell>
      </Cells>
      <OriginalInstanceReportColumns />
      <ElementDataType>us-types:textBlockItemType</ElementDataType>
      <SimpleDataType>textblock</SimpleDataType>
      <ElementDefenition>Describes an entity's accounting policy for goodwill and intangible assets. This accounting policy also may address how an entity assesses and measures impairment of goodwill and intangible assets.</ElementDefenition>
      <ElementReferences>No authoritative reference available.</ElementReferences>
      <IsTotalLabel>false</IsTotalLabel>
    </Row>
  </Rows>
  <Footnotes />
  <NumberOfCols>1</NumberOfCols>
  <NumberOfRows>2</NumberOfRows>
  <HasScenarios>false</HasScenarios>
  <MonetaryRoundingLevel>UnKnown</MonetaryRoundingLevel>
  <SharesRoundingLevel>UnKnown</SharesRoundingLevel>
  <PerShareRoundingLevel>UnKnown</PerShareRoundingLevel>
  <HasPureData>false</HasPureData>
  <SharesShouldBeRounded>true</SharesShouldBeRounded>
</InstanceReport>
